chore: rebase from dev

value4value · May 23, 2024 · 698e93c · 698e93c
1 parent 78a2d67
commit 698e93c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test/integration/BaseIntegrationTest.t.sol b/test/integration/BaseIntegrationTest.t.sol
@@ -84,7 +84,9 @@ contract BaseIntegrationTest is Test {
         blankYieldAggregator = new BlankYieldAggregator(address(sharesFactory), WETH);
 
         sharesNFT.setFactory(address(sharesFactory));
-        sharesFactory.migrate(address(aaveYieldAggregator));
+        sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
+        vm.warp(block.timestamp + sharesFactory.TIMELOCK_DURATION());
+        sharesFactory.executeMigrateYield();
 
         sharesNFT.transferOwnership(FACTORY_OWNER);
         sharesFactory.transferOwnership(FACTORY_OWNER);

diff --git a/test/integration/BaseInvariantTest.t.sol b/test/integration/BaseInvariantTest.t.sol
@@ -66,7 +66,9 @@ contract BaseInvariantTest is StdInvariant {
         blankYieldAggregator = new BlankYieldAggregator(address(sharesFactory), WETH);
 
         sharesNFT.setFactory(address(sharesFactory));
-        sharesFactory.migrate(address(aaveYieldAggregator));
+        sharesFactory.queueMigrateYield(address(aaveYieldAggregator));
+        vm.warp(block.timestamp + sharesFactory.TIMELOCK_DURATION());
+        sharesFactory.executeMigrateYield();
 
         sharesNFT.transferOwnership(FACTORY_OWNER);
         sharesFactory.transferOwnership(FACTORY_OWNER);