diff --git a/script/DeployMock.sol b/script/DeployMock.sol index e54d6e7..06cd761 100644 --- a/script/DeployMock.sol +++ b/script/DeployMock.sol @@ -95,11 +95,15 @@ contract DeployMock is Script { string memory configStr = vm.serializeString(config, vm.toString(block.chainid), chainConfigStr); vm.writeJson(configStr, 'chain.json'); - console2.log('\nPartyPlanner', address(planner)); - console2.log(' PartyPool', address(pool)); - console2.log(' USXD', address(usxd)); - console2.log(' FUSD', address(fusd)); - console2.log(' DIVE', address(dive)); + PartyPoolViewer viewer = Deploy.newViewer(); + + console2.log(); + console2.log(' PartyPlanner', address(planner)); + console2.log(' PartyPool', address(pool)); + console2.log('PartyPoolViewer', address(viewer)); + console2.log(' USXD', address(usxd)); + console2.log(' FUSD', address(fusd)); + console2.log(' DIVE', address(dive)); } MockERC20 private usxd; diff --git a/src/Deploy.sol b/src/Deploy.sol index d5f7019..5a6cc19 100644 --- a/src/Deploy.sol +++ b/src/Deploy.sol @@ -8,7 +8,7 @@ import {PartyPoolBalancedPair} from "./PartyPoolBalancedPair.sol"; import {PartyPoolDeployer, PartyPoolBalancedPairDeployer} from "./PartyPoolDeployer.sol"; import {PartyPoolMintImpl} from "./PartyPoolMintImpl.sol"; import {PartyPoolSwapImpl} from "./PartyPoolSwapImpl.sol"; -import {PartyPoolView} from "./PartyPoolView.sol"; +import {PartyPoolViewer} from "./PartyPoolViewer.sol"; library Deploy { @@ -67,7 +67,7 @@ library Deploy { } - function newViewer() internal returns (PartyPoolView) { - return new PartyPoolView(new PartyPoolSwapImpl(), new PartyPoolMintImpl()); + function newViewer() internal returns (PartyPoolViewer) { + return new PartyPoolViewer(new PartyPoolSwapImpl(), new PartyPoolMintImpl()); } } diff --git a/src/PartyPoolView.sol b/src/PartyPoolViewer.sol similarity index 99% rename from src/PartyPoolView.sol rename to src/PartyPoolViewer.sol index 89af4c6..cbeeb9e 100644 --- a/src/PartyPoolView.sol +++ b/src/PartyPoolViewer.sol @@ -9,7 +9,7 @@ import {PartyPoolHelpers} from "./PartyPoolHelpers.sol"; import {PartyPoolMintImpl} from "./PartyPoolMintImpl.sol"; import {PartyPoolSwapImpl} from "./PartyPoolSwapImpl.sol"; -contract PartyPoolView is PartyPoolHelpers { +contract PartyPoolViewer is PartyPoolHelpers { using ABDKMath64x64 for int128; PartyPoolSwapImpl immutable internal SWAP_IMPL; diff --git a/test/PartyPool.t.sol b/test/PartyPool.t.sol index da0aaec..499ac79 100644 --- a/test/PartyPool.t.sol +++ b/test/PartyPool.t.sol @@ -12,7 +12,7 @@ import "../src/PartyPool.sol"; import "../lib/openzeppelin-contracts/contracts/interfaces/IERC3156FlashBorrower.sol"; import {PartyPlanner} from "../src/PartyPlanner.sol"; import {Deploy} from "../src/Deploy.sol"; -import {PartyPoolView} from "../src/PartyPoolView.sol"; +import {PartyPoolViewer} from "../src/PartyPoolViewer.sol"; /// @notice Test contract that implements the flash callback for testing flash loans contract FlashBorrower is IERC3156FlashBorrower { @@ -117,7 +117,7 @@ contract PartyPoolTest is Test { PartyPlanner planner; PartyPool pool; PartyPool pool10; - PartyPoolView viewer; + PartyPoolViewer viewer; address alice; address bob;