refactor: changed all the revert operations in tests to the same naming

liquity · Jun 29, 2021 · 70f4a3b · 70f4a3b
1 parent 4d08f6e
commit 70f4a3b
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 51 deletions.
diff --git a/packages/contracts/test/CollSurplusPool.js b/packages/contracts/test/CollSurplusPool.js
@@ -47,15 +47,15 @@ contract('CollSurplusPool', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
+    await revertToSnapshot();
   });
 
   it("CollSurplusPool::getETH(): Returns the ETH balance of the CollSurplusPool after redemption", async () => {

diff --git a/packages/contracts/test/FeeArithmeticTest.js b/packages/contracts/test/FeeArithmeticTest.js
@@ -345,15 +345,15 @@ contract('Fee arithmetic tests', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
+    await revertToSnapshot();
   });
 
   it("minutesPassedSinceLastFeeOp(): returns minutes passed for no time increase", async () => {

diff --git a/packages/contracts/test/GasCompensationTest.js b/packages/contracts/test/GasCompensationTest.js
@@ -70,16 +70,16 @@ contract('Gas compensation tests', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
-  }); 
+    await revertToSnapshot();
+  });
 
   // --- Raw gas compensation calculations ---
 

diff --git a/packages/contracts/test/GrowthTokenTest.js b/packages/contracts/test/GrowthTokenTest.js
@@ -125,15 +125,15 @@ contract('LQTY Token', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
+    await revertToSnapshot();
   });
 
   it('balanceOf(): gets the balance of the account', async () => {

diff --git a/packages/contracts/test/LQTYIssuanceArithmeticTest.js b/packages/contracts/test/LQTYIssuanceArithmeticTest.js
@@ -62,15 +62,15 @@ contract('LQTY community issuance arithmetic tests', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
+    await revertToSnapshot();
   });
 
   // Accuracy tests

diff --git a/packages/contracts/test/StabilityPoolTest.js b/packages/contracts/test/StabilityPoolTest.js
@@ -84,17 +84,17 @@ contract('StabilityPool', async accounts => {
       await th.registerFrontEnds(frontEnds, stabilityPool)
     })
 
-    let snapshotId;
+    let revertToSnapshot;
 
     beforeEach(async() => {
       let snapshot = await timeMachine.takeSnapshot();
-      snapshotId = snapshot['result'];
+      revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
     });
 
     afterEach(async() => {
-        await timeMachine.revertToSnapshot(snapshotId);
-    })
-
+      await revertToSnapshot();
+    });
+    
     // --- provideToSP() ---
     // increases recorded LUSD at Stability Pool
     it("provideToSP(): increases the Stability Pool LUSD balance", async () => {

diff --git a/packages/contracts/test/StabilityPool_LQTYIssuanceTest.js b/packages/contracts/test/StabilityPool_LQTYIssuanceTest.js
@@ -99,16 +99,16 @@ contract('StabilityPool - LQTY Rewards', async accounts => {
       issuance_M6 = toBN('41651488815552900').mul(communityLQTYSupply).div(toBN(dec(1, 18)))
     })
 
-    let snapshotId;
+    let revertToSnapshot;
 
     beforeEach(async() => {
       let snapshot = await timeMachine.takeSnapshot();
-      snapshotId = snapshot['result'];
+      revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
     });
 
     afterEach(async() => {
-        await timeMachine.revertToSnapshot(snapshotId);
-    })
+      await revertToSnapshot();
+    });
 
     it("liquidation < 1 minute after a deposit does not change totalLQTYIssued", async () => {
 

diff --git a/packages/contracts/test/StabilityPool_SPWithdrawalTest.js b/packages/contracts/test/StabilityPool_SPWithdrawalTest.js
@@ -75,17 +75,16 @@ contract('StabilityPool - Withdrawal of stability deposit - Reward calculations'
       await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
     })
 
-    let snapshotId;
+    let revertToSnapshot;
 
     beforeEach(async() => {
       let snapshot = await timeMachine.takeSnapshot();
-      snapshotId = snapshot['result'];
+      revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
     });
 
     afterEach(async() => {
-        await timeMachine.revertToSnapshot(snapshotId);
-    })
-
+      await revertToSnapshot();
+    });
     // --- Compounding tests ---
 
     // --- withdrawFromSP()

diff --git a/packages/contracts/test/StabilityPool_SPWithdrawalToCDPTest.js b/packages/contracts/test/StabilityPool_SPWithdrawalToCDPTest.js
@@ -78,17 +78,17 @@ contract('StabilityPool - Withdrawal of stability deposit - Reward calculations'
       await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
     })
 
-    let snapshotId;
+    let revertToSnapshot;
 
     beforeEach(async() => {
       let snapshot = await timeMachine.takeSnapshot();
-      snapshotId = snapshot['result'];
+      revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
     });
 
     afterEach(async() => {
-        await timeMachine.revertToSnapshot(snapshotId);
-    })
-
+      await revertToSnapshot();
+    });
+    
     // --- Compounding tests ---
 
     // --- withdrawETHGainToTrove() ---

diff --git a/packages/contracts/test/TroveManagerTest.js b/packages/contracts/test/TroveManagerTest.js
@@ -84,16 +84,16 @@ contract('TroveManager', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
-  })
+    await revertToSnapshot();
+  });
 
   it('liquidate(): closes a Trove that has ICR < MCR', async () => {
     await openTrove({ ICR: toBN(dec(20, 18)), extraParams: { from: whale } })

diff --git a/packages/contracts/test/TroveManager_LiquidationRewardsTest.js b/packages/contracts/test/TroveManager_LiquidationRewardsTest.js
@@ -64,16 +64,16 @@ contract('TroveManager - Redistribution reward calculations', async accounts =>
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
-  })
+    await revertToSnapshot();
+  });
 
   it("redistribution: A, B Open. B Liquidated. C, D Open. D Liquidated. Distributes correct rewards", async () => {
     // A, B open trove

diff --git a/packages/contracts/test/TroveManager_RecoveryModeTest.js b/packages/contracts/test/TroveManager_RecoveryModeTest.js
@@ -78,16 +78,16 @@ contract('TroveManager - in Recovery Mode', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
-  })
+    await revertToSnapshot();
+  });
 
   it("checkRecoveryMode(): Returns true if TCR falls below CCR", async () => {
     // --- SETUP ---

diff --git a/packages/contracts/test/stakeDeclineTest.js b/packages/contracts/test/stakeDeclineTest.js
@@ -80,16 +80,16 @@ contract('TroveManager', async accounts => {
     await deploymentHelper.connectLQTYContractsToCore(LQTYContracts, contracts)
   })
 
-  let snapshotId;
+  let revertToSnapshot;
 
   beforeEach(async() => {
     let snapshot = await timeMachine.takeSnapshot();
-    snapshotId = snapshot['result'];
+    revertToSnapshot = () => timeMachine.revertToSnapshot(snapshot['result'])
   });
 
   afterEach(async() => {
-      await timeMachine.revertToSnapshot(snapshotId);
-  })
+    await revertToSnapshot();
+  });
 
   it("A given trove's stake decline is negligible with adjustments and tiny liquidations", async () => {
     await priceFeed.setPrice(dec(100, 18))