fix: remove deprecation (#355)

bgd-labs · Nov 22, 2024 · f9e12a1 · f9e12a1
1 parent 1bc10cd
commit f9e12a1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/src/ProtocolV2TestBase.sol b/src/ProtocolV2TestBase.sol
@@ -117,11 +117,11 @@ contract ProtocolV2TestBase is CommonTestBase, DiffUtils {
   function e2eTest(ILendingPool pool) public {
     ReserveConfig[] memory configs = _getReservesConfigs(pool);
     ReserveConfig memory collateralConfig = _getGoodCollateral(configs);
-    uint256 snapshot = vm.snapshot();
+    uint256 snapshot = vm.snapshotState();
     for (uint256 i; i < configs.length; i++) {
       if (_includeInE2e(configs[i])) {
         e2eTestAsset(pool, collateralConfig, configs[i]);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     }
   }
@@ -147,19 +147,19 @@ contract ProtocolV2TestBase is CommonTestBase, DiffUtils {
       _getTokenAmountByEthValue(pool, collateralConfig, 100)
     );
     _deposit(testAssetConfig, pool, testAssetSupplier, testAssetAmount);
-    uint256 snapshot = vm.snapshot();
+    uint256 snapshot = vm.snapshotState();
     // test withdrawal
     _withdraw(testAssetConfig, pool, testAssetSupplier, testAssetAmount / 2);
     _withdraw(testAssetConfig, pool, testAssetSupplier, type(uint256).max);
-    vm.revertTo(snapshot);
+    vm.revertToState(snapshot);
     // test variable borrowing
     if (testAssetConfig.borrowingEnabled) {
       _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount, false);
-      vm.revertTo(snapshot);
+      vm.revertToState(snapshot);
       // test stable borrowing
       if (testAssetConfig.stableBorrowRateEnabled) {
         _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount, true);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     }
   }
@@ -191,7 +191,7 @@ contract ProtocolV2TestBase is CommonTestBase, DiffUtils {
     uint256 amount,
     bool stable
   ) internal {
-    uint256 snapshot = vm.snapshot();
+    uint256 snapshot = vm.snapshotState();
     this._borrow(testAssetConfig, pool, borrower, amount, stable);
     // switching back and forth between rate modes should work
     if (testAssetConfig.stableBorrowRateEnabled) {
@@ -203,7 +203,7 @@ contract ProtocolV2TestBase is CommonTestBase, DiffUtils {
       pool.swapBorrowRateMode(testAssetConfig.underlying, stable ? 1 : 2);
     }
     _repay(testAssetConfig, pool, borrower, amount, stable);
-    vm.revertTo(snapshot);
+    vm.revertToState(snapshot);
   }
 
   /**

diff --git a/src/ProtocolV3TestBase.sol b/src/ProtocolV3TestBase.sol
@@ -124,11 +124,11 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
   function e2eTest(IPool pool) public {
     ReserveConfig[] memory configs = _getReservesConfigs(pool);
     ReserveConfig memory collateralConfig = _getGoodCollateral(configs);
-    uint256 snapshot = vm.snapshot();
+    uint256 snapshot = vm.snapshotState();
     for (uint256 i; i < configs.length; i++) {
       if (_includeInE2e(configs[i])) {
         e2eTestAsset(pool, collateralConfig, configs[i]);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       } else {
         console.log('E2E: TestAsset %s SKIPPED', configs[i].symbol);
       }
@@ -166,20 +166,20 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
     // GHO is a special case as it cannot be supplied
     if (testAssetConfig.underlying == AaveV3EthereumAssets.GHO_UNDERLYING) {
       _deposit(collateralConfig, pool, collateralSupplier, collateralAssetAmount);
-      uint256 snapshot = vm.snapshot();
+      uint256 snapshot = vm.snapshotState();
       // test variable borrowing
       if (testAssetConfig.borrowingEnabled) {
         _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     } else {
       _deposit(collateralConfig, pool, collateralSupplier, collateralAssetAmount);
       _deposit(testAssetConfig, pool, testAssetSupplier, testAssetAmount);
-      uint256 snapshot = vm.snapshot();
+      uint256 snapshot = vm.snapshotState();
       // test withdrawal
       _withdraw(testAssetConfig, pool, testAssetSupplier, testAssetAmount / 2);
       _withdraw(testAssetConfig, pool, testAssetSupplier, type(uint256).max);
-      vm.revertTo(snapshot);
+      vm.revertToState(snapshot);
       // test variable borrowing
       if (testAssetConfig.borrowingEnabled) {
         if (
@@ -190,7 +190,7 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
           return;
         }
         _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     }
   }

diff --git a/tests/ProtocolV3TestBase.t.sol b/tests/ProtocolV3TestBase.t.sol
@@ -125,18 +125,17 @@ contract ProtocolV3TestOptimismSnapshot is ProtocolV3TestBase {
     vm.createSelectFork('optimism', 117408311);
   }
 
-  function test_snapshot() public {
+  function test_snapshotState() public {
     createConfigurationSnapshot('snapshot', AaveV3Optimism.POOL, true, false, false, false);
   }
 }
 
-
 contract ProtocolV3TestFantomSnapshot is ProtocolV3TestBase {
   function setUp() public {
     vm.createSelectFork('fantom', 86731015);
   }
 
-  function test_snapshot() public {
+  function test_snapshotState() public {
     createConfigurationSnapshot('snapshotFtm', AaveV3Fantom.POOL, true, false, false, false);
   }
 }
diff --git a/zksync/src/ProtocolV3TestBase.sol b/zksync/src/ProtocolV3TestBase.sol
@@ -168,11 +168,11 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
   function e2eTest(IPool pool) public {
     ReserveConfig[] memory configs = _getReservesConfigs(pool);
     ReserveConfig memory collateralConfig = _getGoodCollateral(configs);
-    uint256 snapshot = vm.snapshot();
+    uint256 snapshot = vm.snapshotState();
     for (uint256 i; i < configs.length; i++) {
       if (_includeInE2e(configs[i])) {
         e2eTestAsset(pool, collateralConfig, configs[i]);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       } else {
         console.log('E2E: TestAsset %s SKIPPED', configs[i].symbol);
       }
@@ -210,20 +210,20 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
     // GHO is a special case as it cannot be supplied
     if (testAssetConfig.underlying == AaveV3EthereumAssets.GHO_UNDERLYING) {
       _deposit(collateralConfig, pool, collateralSupplier, collateralAssetAmount);
-      uint256 snapshot = vm.snapshot();
+      uint256 snapshot = vm.snapshotState();
       // test variable borrowing
       if (testAssetConfig.borrowingEnabled) {
         _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     } else {
       _deposit(collateralConfig, pool, collateralSupplier, collateralAssetAmount);
       _deposit(testAssetConfig, pool, testAssetSupplier, testAssetAmount);
-      uint256 snapshot = vm.snapshot();
+      uint256 snapshot = vm.snapshotState();
       // test withdrawal
       _withdraw(testAssetConfig, pool, testAssetSupplier, testAssetAmount / 2);
       _withdraw(testAssetConfig, pool, testAssetSupplier, type(uint256).max);
-      vm.revertTo(snapshot);
+      vm.revertToState(snapshot);
       // test variable borrowing
       if (testAssetConfig.borrowingEnabled) {
         if (
@@ -234,7 +234,7 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
           return;
         }
         _e2eTestBorrowRepay(pool, collateralSupplier, testAssetConfig, testAssetAmount);
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
       }
     }
   }