refactor: base now has common selectors

morpho-org · Nov 24, 2024 · bbb41ae · bbb41ae
1 parent fed35cb
commit bbb41ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/test/forge/invariant/BaseMorphoInvariantTest.sol b/test/forge/invariant/BaseMorphoInvariantTest.sol
@@ -19,6 +19,15 @@ contract BaseMorphoInvariantTest is InvariantTest {
     }
 
     function setUp() public virtual override {
+        _weightSelector(this.supplyAssetsOnBehalfNoRevert.selector, 15);
+        _weightSelector(this.supplySharesOnBehalfNoRevert.selector, 5);
+        _weightSelector(this.withdrawAssetsOnBehalfNoRevert.selector, 10);
+        _weightSelector(this.borrowAssetsOnBehalfNoRevert.selector, 15);
+        _weightSelector(this.repayAssetsOnBehalfNoRevert.selector, 10);
+        _weightSelector(this.repaySharesOnBehalfNoRevert.selector, 10);
+        _weightSelector(this.supplyCollateralOnBehalfNoRevert.selector, 15);
+        _weightSelector(this.withdrawCollateralOnBehalfNoRevert.selector, 10);
+
         super.setUp();
 
         allMarketParams.push(marketParams);

diff --git a/test/forge/invariant/MorphoDynamicInvariantTest.sol b/test/forge/invariant/MorphoDynamicInvariantTest.sol
@@ -14,14 +14,6 @@ contract MorphoDynamicInvariantTest is BaseMorphoInvariantTest {
     uint256 internal immutable MAX_PRICE = ORACLE_PRICE_SCALE * 10;
 
     function setUp() public virtual override {
-        _weightSelector(this.supplyAssetsOnBehalfNoRevert.selector, 15);
-        _weightSelector(this.supplySharesOnBehalfNoRevert.selector, 5);
-        _weightSelector(this.withdrawAssetsOnBehalfNoRevert.selector, 10);
-        _weightSelector(this.borrowAssetsOnBehalfNoRevert.selector, 15);
-        _weightSelector(this.repayAssetsOnBehalfNoRevert.selector, 10);
-        _weightSelector(this.repaySharesOnBehalfNoRevert.selector, 10);
-        _weightSelector(this.supplyCollateralOnBehalfNoRevert.selector, 15);
-        _weightSelector(this.withdrawCollateralOnBehalfNoRevert.selector, 10);
         _weightSelector(this.liquidateSeizedAssetsNoRevert.selector, 2);
         _weightSelector(this.liquidateRepaidSharesNoRevert.selector, 2);
         _weightSelector(this.setFeeNoRevert.selector, 1);

diff --git a/test/forge/invariant/MorphoStaticInvariantTest.sol b/test/forge/invariant/MorphoStaticInvariantTest.sol
@@ -10,20 +10,6 @@ contract MorphoStaticInvariantTest is BaseMorphoInvariantTest {
     using MorphoBalancesLib for IMorpho;
     using MarketParamsLib for MarketParams;
 
-    function setUp() public virtual override {
-        _weightSelector(this.supplyAssetsOnBehalfNoRevert.selector, 12);
-        _weightSelector(this.supplySharesOnBehalfNoRevert.selector, 5);
-        _weightSelector(this.withdrawAssetsOnBehalfNoRevert.selector, 12);
-        _weightSelector(this.borrowAssetsOnBehalfNoRevert.selector, 17);
-        _weightSelector(this.repayAssetsOnBehalfNoRevert.selector, 12);
-        _weightSelector(this.repaySharesOnBehalfNoRevert.selector, 10);
-        _weightSelector(this.supplyCollateralOnBehalfNoRevert.selector, 15);
-        _weightSelector(this.withdrawCollateralOnBehalfNoRevert.selector, 10);
-        _weightSelector(this.setFeeNoRevert.selector, 2);
-
-        super.setUp();
-    }
-
     /* INVARIANTS */
 
     function invariantHealthy() public {