Merge pull request #459 from morpho-org/fix/restore-steth-fork-test

Run StEth fork test by default
morpho-org · Oct 28, 2024 · a18dd8b · a18dd8b
2 parents c8f59d9 + 005b034
commit a18dd8b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/test/forge/fork/StEthBundlerForkTest.sol b/test/forge/fork/StEthBundlerForkTest.sol
@@ -17,10 +17,10 @@ contract EthereumStEthBundlerForkTest is ForkTest {
     using SafeTransferLib for ERC20;
 
     function setUp() public override {
-        if (block.chainid != 1) return;
-
         super.setUp();
 
+        if (block.chainid != 1) return;
+
         bundler = new EthereumStEthBundlerMock();
     }
 

diff --git a/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol b/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol
@@ -21,10 +21,10 @@ contract AaveV2MigrationBundlerForkTest is MigrationForkTest {
     uint256 borrowed = 1 ether;
 
     function setUp() public override {
-        if (block.chainid != 1) return;
-
         super.setUp();
 
+        if (block.chainid != 1) return;
+
         _initMarket(DAI, WETH);
 
         vm.label(AAVE_V2_POOL, "Aave V2 Pool");

diff --git a/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol
@@ -17,10 +17,10 @@ contract CompoundV2EthLoanMigrationBundlerForkTest is MigrationForkTest {
     address[] internal enteredMarkets;
 
     function setUp() public override {
-        if (block.chainid != 1) return;
-
         super.setUp();
 
+        if (block.chainid != 1) return;
+
         _initMarket(DAI, WETH);
 
         bundler = new CompoundV2MigrationBundlerV2(address(morpho), WETH, C_ETH_V2);

diff --git a/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol
@@ -17,10 +17,10 @@ contract CompoundV2EthCollateralMigrationBundlerForkTest is MigrationForkTest {
     address[] internal enteredMarkets;
 
     function setUp() public override {
-        if (block.chainid != 1) return;
-
         super.setUp();
 
+        if (block.chainid != 1) return;
+
         _initMarket(WETH, DAI);
 
         bundler = new CompoundV2MigrationBundlerV2(address(morpho), WETH, C_ETH_V2);

diff --git a/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol
@@ -17,10 +17,10 @@ contract CompoundV2NoEthMigrationBundlerForkTest is MigrationForkTest {
     address[] internal enteredMarkets;
 
     function setUp() public override {
-        if (block.chainid != 1) return;
-
         super.setUp();
 
+        if (block.chainid != 1) return;
+
         _initMarket(DAI, USDC);
 
         bundler = new CompoundV2MigrationBundlerV2(address(morpho), WETH, C_ETH_V2);