Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: rebase setupFactory logic with latest SharesFactory
Browse files Browse the repository at this point in the history
aquariuslt committed May 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 698e93c commit 30c0597
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
"test": "forge test -vvv --mp \"test/unit/**/*.sol\" --fork-url https://mainnet.optimism.io",
"test:integration": "forge test -vvv --mp \"test/integration/*/*.sol\" --fork-url https://mainnet.optimism.io ",
"test:invariant": "forge test -vvv --mc BaseInvariantTest --fork-url https://optimism.llamarpc.com/sk_llama_3f92d666a172604faf69e469a67ec6ea ",
"test:income": "forge test -vv --mp \"test/integration/IncomeSimulator.t.sol\" --fork-url https://mainnet.optimism.io ",
"test:income": "forge test -vvvv --mp \"test/integration/IncomeSimulator.t.sol\" --fork-url https://mainnet.optimism.io ",
"coverage": "forge coverage --mp \"test/unit/**/*.sol\" --fork-url https://mainnet.optimism.io ",
"deploy:testnet": "make deploy-testnet",
"deploy:mainnet": "make deploy-mainnet",
14 changes: 10 additions & 4 deletions test/integration/BaseIntegrationTest.t.sol
Original file line number Diff line number Diff line change
@@ -83,14 +83,20 @@ contract BaseIntegrationTest is Test {
aaveYieldAggregator = new AaveYieldAggregator(address(sharesFactory), WETH, AAVE_POOL, AAVE_WETH_GATEWAY);
blankYieldAggregator = new BlankYieldAggregator(address(sharesFactory), WETH);


sharesNFT.setFactory(address(sharesFactory));
sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
vm.warp(block.timestamp + sharesFactory.TIMELOCK_DURATION());
sharesFactory.executeMigrateYield();
sharesFactory.resetYield(address(blankYieldAggregator));

sharesNFT.transferOwnership(FACTORY_OWNER);
sharesFactory.transferOwnership(FACTORY_OWNER);
aaveYieldAggregator.transferOwnership(FACTORY_OWNER);

sharesFactory.transferOwnership(FACTORY_OWNER);
sharesFactory.acceptOwnership();

sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
vm.warp(block.timestamp + 4 days);
sharesFactory.executeMigrateYield();

vm.stopPrank();
}

0 comments on commit 30c0597

Please sign in to comment.