fix: apply suggestions

morpho-org · Aug 22, 2023 · b45366c · b45366c
1 parent d0fd553
commit b45366c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 73 deletions.
diff --git a/test/forge/InvariantBase.sol b/test/forge/InvariantBase.sol
@@ -69,9 +69,10 @@ contract InvariantBaseTest is BaseTest {
         timestamp += elapsed;
     }
 
-    function setCorrectBlock() internal {
+    modifier setCorrectBlock() {
         vm.roll(blockNumber);
         vm.warp(timestamp);
+        _;
     }
 
     function _randomSenderToWithdrawOnBehalf(address[] memory addresses, address seed, address sender)

diff --git a/test/forge/invariant/TestInvariantSingleMarket.t.sol b/test/forge/invariant/TestInvariantSingleMarket.t.sol
@@ -26,35 +26,30 @@ contract SingleMarketInvariantTest is InvariantBaseTest {
         _weightSelector(this.withdrawOnMorpho.selector, 15);
         _weightSelector(this.supplyCollateralOnMorpho.selector, 20);
         _weightSelector(this.withdrawCollateralOnMorpho.selector, 15);
-        _weightSelector(this.newBlock.selector, 10);
+        _weightSelector(this.newBlock.selector, 20);
 
         blockNumber = block.number;
         timestamp = block.timestamp;
 
         targetSelector(FuzzSelector({addr: address(this), selectors: selectors}));
     }
 
-    function setMarketFee(uint256 newFee) public {
-        setCorrectBlock();
-
+    function setMarketFee(uint256 newFee) public setCorrectBlock {
         newFee = bound(newFee, 0.1e18, MAX_FEE);
 
         vm.prank(OWNER);
         morpho.setFee(market, newFee);
     }
 
-    function supplyOnMorpho(uint256 amount) public {
-        setCorrectBlock();
-
+    function supplyOnMorpho(uint256 amount) public setCorrectBlock {
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
 
         borrowableToken.setBalance(msg.sender, amount);
         vm.prank(msg.sender);
         morpho.supply(market, amount, 0, msg.sender, hex"");
     }
 
-    function withdrawOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function withdrawOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -70,8 +65,7 @@ contract SingleMarketInvariantTest is InvariantBaseTest {
         morpho.withdraw(market, amount, 0, msg.sender, msg.sender);
     }
 
-    function borrowOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function borrowOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -84,8 +78,7 @@ contract SingleMarketInvariantTest is InvariantBaseTest {
         morpho.borrow(market, amount, 0, msg.sender, msg.sender);
     }
 
-    function repayOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function repayOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         if (morpho.borrowShares(id, msg.sender) == 0) return;
@@ -101,18 +94,15 @@ contract SingleMarketInvariantTest is InvariantBaseTest {
         morpho.repay(market, amount, 0, msg.sender, hex"");
     }
 
-    function supplyCollateralOnMorpho(uint256 amount) public {
-        setCorrectBlock();
-
+    function supplyCollateralOnMorpho(uint256 amount) public setCorrectBlock {
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
 
         collateralToken.setBalance(msg.sender, amount);
         vm.prank(msg.sender);
         morpho.supplyCollateral(market, amount, msg.sender, hex"");
     }
 
-    function withdrawCollateralOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function withdrawCollateralOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         amount = bound(amount, 1, MAX_TEST_AMOUNT);

diff --git a/test/forge/invariant/TestInvariantSingleMarketChangingPrice.t.sol b/test/forge/invariant/TestInvariantSingleMarketChangingPrice.t.sol
@@ -27,7 +27,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         _weightSelector(this.supplyCollateralOnMorpho.selector, 20);
         _weightSelector(this.withdrawCollateralOnMorpho.selector, 5);
         _weightSelector(this.withdrawCollateralOnMorphoOnBehalf.selector, 5);
-        _weightSelector(this.newBlock.selector, 5);
+        _weightSelector(this.newBlock.selector, 20);
         _weightSelector(this.changePrice.selector, 5);
         _weightSelector(this.setMarketFee.selector, 2);
 
@@ -39,39 +39,29 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         oracle.setPrice(1e36);
     }
 
-    function changePrice(uint256 variation, bool add) public {
-        // price variation bounded between 2% and 20%
-        variation = bound(variation, 2e16, 2e17);
+    function changePrice(uint256 variation) public {
+        // price variation bounded between -20% and +20%
+        variation = bound(variation, 0.8e18, 1.2e18);
         uint256 currentPrice = IOracle(market.oracle).price();
-        uint256 priceVariation = currentPrice.wMulDown(variation);
-        if (add) {
-            oracle.setPrice(currentPrice + priceVariation);
-        } else {
-            oracle.setPrice(currentPrice - priceVariation);
-        }
+        oracle.setPrice(currentPrice.wMulDown(variation));
     }
 
-    function setMarketFee(uint256 newFee) public {
-        setCorrectBlock();
-
+    function setMarketFee(uint256 newFee) public setCorrectBlock {
         newFee = bound(newFee, 0, MAX_FEE);
 
         vm.prank(OWNER);
         morpho.setFee(market, newFee);
     }
 
-    function supplyOnMorpho(uint256 amount) public {
-        setCorrectBlock();
-
+    function supplyOnMorpho(uint256 amount) public setCorrectBlock {
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
         borrowableToken.setBalance(msg.sender, amount);
 
         vm.prank(msg.sender);
         morpho.supply(market, amount, 0, msg.sender, hex"");
     }
 
-    function withdrawOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function withdrawOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -88,8 +78,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.withdraw(market, amount, 0, msg.sender, msg.sender);
     }
 
-    function withdrawOnMorphoOnBehalf(uint256 amount, address seed) public {
-        setCorrectBlock();
+    function withdrawOnMorphoOnBehalf(uint256 amount, address seed) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -108,8 +97,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.withdraw(market, amount, 0, onBehalf, msg.sender);
     }
 
-    function borrowOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function borrowOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -131,8 +119,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.borrow(market, amount, 0, msg.sender, msg.sender);
     }
 
-    function borrowOnMorphoOnBehalf(uint256 amount, address seed) public {
-        setCorrectBlock();
+    function borrowOnMorphoOnBehalf(uint256 amount, address seed) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 availableLiquidity = morpho.totalSupplyAssets(id) - morpho.totalBorrowAssets(id);
@@ -156,8 +143,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.borrow(market, amount, 0, onBehalf, msg.sender);
     }
 
-    function repayOnMorpho(uint256 shares) public {
-        setCorrectBlock();
+    function repayOnMorpho(uint256 shares) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         uint256 borrowShares = morpho.borrowShares(id, msg.sender);
@@ -173,8 +159,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.repay(market, 0, shares, msg.sender, hex"");
     }
 
-    function repayOnMorphoOnBehalf(uint256 shares, address seed) public {
-        setCorrectBlock();
+    function repayOnMorphoOnBehalf(uint256 shares, address seed) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         address onBehalf = _randomSenderToRepayOnBehalf(targetSenders(), seed);
@@ -190,8 +175,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.repay(market, 0, shares, onBehalf, hex"");
     }
 
-    function supplyCollateralOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function supplyCollateralOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
@@ -201,8 +185,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.supplyCollateral(market, amount, msg.sender, hex"");
     }
 
-    function withdrawCollateralOnMorpho(uint256 amount) public {
-        setCorrectBlock();
+    function withdrawCollateralOnMorpho(uint256 amount) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         if (morpho.collateral(id, msg.sender) == 0 || !isHealthy(id, msg.sender)) return;
@@ -223,8 +206,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.withdrawCollateral(market, amount, msg.sender, msg.sender);
     }
 
-    function withdrawCollateralOnMorphoOnBehalf(uint256 amount, address seed) public {
-        setCorrectBlock();
+    function withdrawCollateralOnMorphoOnBehalf(uint256 amount, address seed) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         address onBehalf = _randomSenderToWithdrawCollateralOnBehalf(targetSenders(), seed, msg.sender);
@@ -246,8 +228,7 @@ contract SingleMarketChangingPriceInvariantTest is InvariantBaseTest {
         morpho.withdrawCollateral(market, amount, onBehalf, msg.sender);
     }
 
-    function liquidateOnMorpho(uint256 seized, address seed) public {
-        setCorrectBlock();
+    function liquidateOnMorpho(uint256 seized, address seed) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         user = _randomSenderToLiquidate(targetSenders(), seed);

diff --git a/test/forge/invariant/TestInvariantTwoMarkets.t.sol b/test/forge/invariant/TestInvariantTwoMarkets.t.sol
@@ -45,7 +45,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         _weightSelector(this.withdrawOnMorpho.selector, 15);
         _weightSelector(this.supplyCollateralOnMorpho.selector, 20);
         _weightSelector(this.withdrawCollateralOnMorpho.selector, 15);
-        _weightSelector(this.newBlock.selector, 10);
+        _weightSelector(this.newBlock.selector, 20);
 
         blockNumber = block.number;
         timestamp = block.timestamp;
@@ -63,18 +63,16 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         }
     }
 
-    function setMarketFee(uint256 newFee) public {
-        setCorrectBlock();
+    function setMarketFee(uint256 newFee, bool changeMarket) public setCorrectBlock {
+        (MarketParams memory chosenMarket,) = chooseMarket(changeMarket);
 
         newFee = bound(newFee, 0.1e18, MAX_FEE);
 
         vm.prank(OWNER);
-        morpho.setFee(market, newFee);
+        morpho.setFee(chosenMarket, newFee);
     }
 
-    function supplyOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
-
+    function supplyOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         (MarketParams memory chosenMarket,) = chooseMarket(changeMarket);
 
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
@@ -84,8 +82,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         morpho.supply(chosenMarket, amount, 0, msg.sender, hex"");
     }
 
-    function withdrawOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
+    function withdrawOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         (MarketParams memory chosenMarket, Id chosenId) = chooseMarket(changeMarket);
@@ -104,8 +101,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         morpho.withdraw(chosenMarket, amount, 0, msg.sender, msg.sender);
     }
 
-    function borrowOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
+    function borrowOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         (MarketParams memory chosenMarket, Id chosenId) = chooseMarket(changeMarket);
@@ -120,8 +116,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         morpho.borrow(chosenMarket, amount, 0, msg.sender, msg.sender);
     }
 
-    function repayOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
+    function repayOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         (MarketParams memory chosenMarket, Id chosenId) = chooseMarket(changeMarket);
@@ -142,9 +137,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         morpho.repay(chosenMarket, amount, 0, msg.sender, hex"");
     }
 
-    function supplyCollateralOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
-
+    function supplyCollateralOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         (MarketParams memory chosenMarket,) = chooseMarket(changeMarket);
 
         amount = bound(amount, 1, MAX_TEST_AMOUNT);
@@ -154,8 +147,7 @@ contract TwoMarketsInvariantTest is InvariantBaseTest {
         morpho.supplyCollateral(chosenMarket, amount, msg.sender, hex"");
     }
 
-    function withdrawCollateralOnMorpho(uint256 amount, bool changeMarket) public {
-        setCorrectBlock();
+    function withdrawCollateralOnMorpho(uint256 amount, bool changeMarket) public setCorrectBlock {
         morpho.accrueInterest(market);
 
         (MarketParams memory chosenMarket,) = chooseMarket(changeMarket);