Merge pull request #1652 from morpho-dao/test/fix-integration-test-owner

Fix CI
morpho-org · Mar 8, 2023 · c66cdf3 · c66cdf3
2 parents 4f8d936 + 9037784
commit c66cdf3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/config/aave-v2/Config.sol b/config/aave-v2/Config.sol
@@ -40,7 +40,6 @@ contract Config is BaseConfig {
 
     address constant swapRouterAddress = 0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D;
 
-    address public morphoDao = 0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa;
     ILendingPoolAddressesProvider public poolAddressesProvider =
         ILendingPoolAddressesProvider(0xB53C1a33016B2DC2fF3653530bfF1848a515c8c5);
     ILendingPoolConfigurator public lendingPoolConfigurator =

diff --git a/config/compound/Config.sol b/config/compound/Config.sol
@@ -34,7 +34,6 @@ contract Config is BaseConfig {
     address constant cUsdp = 0x041171993284df560249B57358F931D9eB7b925D;
     address constant cSushi = 0x4B0181102A0112A2ef11AbEE5563bb4a3176c9d7;
 
-    address public morphoDao = 0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa;
     IComptroller public comptroller = IComptroller(0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B);
     ICompoundOracle public oracle = ICompoundOracle(comptroller.oracle());
 

diff --git a/test/prod/aave-v2/TestDeltas.t.sol b/test/prod/aave-v2/TestDeltas.t.sol
@@ -59,7 +59,7 @@ contract TestDeltas is TestSetup {
                 address(morpho)
             );
 
-            vm.prank(morphoDao);
+            vm.prank(proxyAdmin.owner());
             morpho.increaseP2PDeltas(test.market.poolToken, type(uint256).max);
 
             (
@@ -108,14 +108,14 @@ contract TestDeltas is TestSetup {
             assertApproxEqAbs(
                 p2pSupplyUnderlying - supplyDeltaUnderlyingBefore,
                 IAToken(test.market.poolToken).balanceOf(address(morpho)) - test.morphoSupplyBefore,
-                2,
+                3,
                 "morpho pool supply"
             );
             assertApproxEqAbs(
                 p2pBorrowUnderlying - borrowDeltaUnderlyingBefore,
                 IVariableDebtToken(test.market.debtToken).balanceOf(address(morpho)) -
                     test.morphoBorrowBefore,
-                2,
+                3,
                 "morpho pool borrow"
             );
         }
@@ -150,7 +150,7 @@ contract TestDeltas is TestSetup {
                 p2pBorrowUnderlying > borrowDeltaUnderlyingBefore
             ) continue;
 
-            vm.prank(morphoDao);
+            vm.prank(proxyAdmin.owner());
             vm.expectRevert(PositionsManagerUtils.AmountIsZero.selector);
             morpho.increaseP2PDeltas(test.market.poolToken, type(uint256).max);
         }

diff --git a/test/prod/aave-v2/setup/TestSetup.sol b/test/prod/aave-v2/setup/TestSetup.sol
@@ -291,7 +291,7 @@ contract TestSetup is Config, Test {
 
     /// @dev Upgrades all the protocol contracts.
     function _upgrade() internal {
-        vm.startPrank(morphoDao);
+        vm.startPrank(proxyAdmin.owner());
         address morphoImplV2 = address(new Morpho());
         proxyAdmin.upgrade(morphoProxy, morphoImplV2);
         vm.label(morphoImplV2, "MorphoImplV2");

diff --git a/test/prod/compound/TestDeltas.t.sol b/test/prod/compound/TestDeltas.t.sol
@@ -63,7 +63,7 @@ contract TestDeltas is TestSetup {
                 address(morpho)
             );
 
-            vm.prank(morphoDao);
+            vm.prank(proxyAdmin.owner());
             morpho.increaseP2PDeltas(test.market.poolToken, type(uint256).max);
 
             (
@@ -156,7 +156,7 @@ contract TestDeltas is TestSetup {
                 p2pBorrowUnderlying > borrowDeltaUnderlyingBefore
             ) continue;
 
-            vm.prank(morphoDao);
+            vm.prank(proxyAdmin.owner());
             vm.expectRevert(PositionsManager.AmountIsZero.selector);
             morpho.increaseP2PDeltas(test.market.poolToken, type(uint256).max);
         }

diff --git a/test/prod/compound/setup/TestSetup.sol b/test/prod/compound/setup/TestSetup.sol
@@ -254,7 +254,7 @@ contract TestSetup is Config, Test {
 
     /// @dev Upgrades all the protocol contracts.
     function _upgrade() internal {
-        vm.startPrank(morphoDao);
+        vm.startPrank(proxyAdmin.owner());
         address rewardsManagerImplV2 = address(new RewardsManager());
         proxyAdmin.upgrade(rewardsManagerProxy, rewardsManagerImplV2);
         vm.label(rewardsManagerImplV2, "RewardsManagerImplV2");