Keep stub default success and reset function

We set default value for success in ECDSAKeepStub to be true and added reset value used in before tests blocks to set it back to default value. We removed redundant `setSussess(true)` calls, we no longer need them as we reset it.
keep-network · Mar 24, 2020 · b77f589 · b77f589
1 parent c092693
commit b77f589
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/implementation/contracts/test/keep/ECDSAKeepStub.sol b/implementation/contracts/test/keep/ECDSAKeepStub.sol
@@ -67,6 +67,10 @@ contract ECDSAKeepStub is IBondedECDSAKeep {
 
     // Functions to set data for tests.
 
+    function reset() public {
+        success = true;
+    }
+
     function setPublicKey(bytes memory _publicKey) public {
         publicKey = _publicKey;
     }

diff --git a/implementation/test/DepositFraudTest.js b/implementation/test/DepositFraudTest.js
@@ -72,7 +72,7 @@ describe("DepositFraud", async function() {
       const block = await web3.eth.getBlock("latest")
       const blockTimestamp = block.timestamp
       fundingProofTimerStart = blockTimestamp - timer.toNumber() - 1 // has elapsed
-      await ecdsaKeepStub.setSuccess(true)
+
       await testDeposit.setState(states.AWAITING_BTC_FUNDING_PROOF)
 
       await ecdsaKeepStub.send(1000000, {from: owner})
@@ -441,8 +441,7 @@ describe("DepositFraud", async function() {
   describe("provideECDSAFraudProof", async () => {
     before(async () => {
       await testDeposit.setState(states.ACTIVE)
-      await ecdsaKeepStub.send(1000000, {from: owner})
-      await ecdsaKeepStub.setSuccess(true)
+      await ecdsaKeepStub.send(1000000, { from: owner })
     })
 
     beforeEach(async () => {

diff --git a/implementation/test/DepositRedemptionTest.js b/implementation/test/DepositRedemptionTest.js
@@ -510,7 +510,6 @@ describe("DepositRedemption", async function() {
       await tbtcToken.resetAllowance(testDeposit.address, requiredBalance, {
         from: owner,
       })
-      await ecdsaKeepStub.setSuccess(true)
     })
 
     afterEach(async () => {
@@ -797,7 +796,6 @@ describe("DepositRedemption", async function() {
         withdrawalRequestTime,
         prevSighash,
       )
-      await ecdsaKeepStub.setSuccess(true)
     })
 
     it("approves a new digest for signing, updates the state, and logs RedemptionRequested", async () => {

diff --git a/implementation/test/VendingMachineTest.js b/implementation/test/VendingMachineTest.js
@@ -35,7 +35,6 @@ describe("VendingMachine", async function() {
   let tbtcDepositToken
   let feeRebateToken
   let testDeposit
-  let ecdsaKeepStub
 
   let assertBalance
   let tdtId
@@ -47,18 +46,17 @@ describe("VendingMachine", async function() {
 
   before(async () => {
     let deployed
-    ;({
-      mockRelay,
-      tbtcSystemStub,
-      tbtcToken,
-      tbtcDepositToken,
-      feeRebateToken,
-      testDeposit,
-      ecdsaKeepStub,
-      deployed,
-      redemptionScript,
-      fundingScript,
-    } = await deployAndLinkAll())
+      ; ({
+        mockRelay,
+        tbtcSystemStub,
+        tbtcToken,
+        tbtcDepositToken,
+        feeRebateToken,
+        testDeposit,
+        deployed,
+        redemptionScript,
+        fundingScript,
+      } = await deployAndLinkAll())
     vendingMachine = deployed.VendingMachine
 
     assertBalance = new AssertBalance(tbtcToken)
@@ -337,7 +335,6 @@ describe("VendingMachine", async function() {
       await tbtcToken.resetAllowance(vendingMachine.address, requiredBalance, {
         from: owner,
       })
-      await ecdsaKeepStub.setSuccess(true)
       await testDeposit.setState(states.ACTIVE)
       await testDeposit.setUTXOInfo(valueBytes, block.timestamp, outpoint)
     })