fix: gas test

EYBlockchain · Aug 15, 2022 · 4734ece · 4734ece
1 parent c02f9b2
commit 4734ece
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "neg-test": "mocha --timeout 0 --bail --exit test/neg-http.mjs",
     "neg-test-ropsten": "mocha --timeout 0 --bail --exit test/neg-http.mjs",
     "test-e2e-protocol": "LOG_LEVEL=error mocha --timeout 0 --bail --exit test/e2e/protocol/*.test.mjs ",
-    "test-gas": "mocha --timeout 0 --bail --exit test/e2e/gas.test.mjs ",
+    "test-gas": "LOG_LEVEL=error mocha --timeout 0 --bail --exit test/e2e/gas.test.mjs ",
     "test-circuits": "LOG_LEVEL=error mocha --timeout 0 --bail --exit test/e2e/circuits.test.mjs ",
     "test-e2e-tokens": "LOG_LEVEL=error mocha --timeout 0 --bail --exit test/e2e/tokens/*.test.mjs ",
     "test-erc20-tokens": "LOG_LEVEL=error mocha --timeout 0 --bail --exit test/e2e/tokens/erc20.test.mjs ",

diff --git a/test/adversary.test.mjs b/test/adversary.test.mjs
@@ -124,7 +124,7 @@ describe('Testing with an adversary', () => {
     // Chalenger listening for incoming events
     const challengerEmitter = await nf3Challenger.startChallenger();
 
-    challengerEmitter.on('data', txDataToSign => {
+    challengerEmitter.on('receipt', txDataToSign => {
       logger.debug(`Challenger emitter with data ${txDataToSign}`);
     });
 
@@ -141,7 +141,7 @@ describe('Testing with an adversary', () => {
 
     console.log('Pausing challenger queue...');
     // we pause the challenger queue and don't process challenger until unpauseQueueChallenger
-    nf3Challenger.pauseQueueChallenger();
+    await nf3Challenger.pauseQueueChallenger();
   });
 
   describe('User creates deposit and transfer transactions', () => {
@@ -224,7 +224,7 @@ describe('Testing with an adversary', () => {
     it('User should have the correct balance after challenge and a series of rollbacks', async () => {
       console.log('Unpausing challenger queue...');
       // Challenger unpause
-      await nf3Challenger.unpauseQueueChallenger();
+      nf3Challenger.unpauseQueueChallenger();
       // waiting sometime to ensure that all the good transactions from bad
       // blocks were proposed in other good blocks
       console.log('Waiting for rollbacks...');

diff --git a/test/e2e/gas.test.mjs b/test/e2e/gas.test.mjs
@@ -82,7 +82,7 @@ describe('Gas test', () => {
         tokenId,
         0,
       );
-      eventLogs = await web3Client.waitForEvent(eventLogs, ['blockProposed']);
+      ({ eventLogs } = await web3Client.waitForEvent(eventLogs, ['blockProposed']));
 
       expect(gasCost).to.be.lessThan(expectedGasCostPerTx);
     });
@@ -97,7 +97,7 @@ describe('Gas test', () => {
         tokenId,
         0,
       );
-      eventLogs = await web3Client.waitForEvent(eventLogs, ['blockProposed']);
+      ({ eventLogs } = await web3Client.waitForEvent(eventLogs, ['blockProposed']));
       expect(gasCost).to.be.lessThan(expectedGasCostPerTx);
       console.log('Deposit L1 average gas used was', averageL1GasCost(receipts));
     });
@@ -116,7 +116,7 @@ describe('Gas test', () => {
         nf3Users[0].zkpKeys.compressedZkpPublicKey,
         0,
       );
-      eventLogs = await web3Client.waitForEvent(eventLogs, ['blockProposed']);
+      ({ eventLogs } = await web3Client.waitForEvent(eventLogs, ['blockProposed']));
       expect(gasCost).to.be.lessThan(expectedGasCostPerTx);
       console.log(
         'Single transfer L1 average gas used, if on-chain, was',
@@ -138,7 +138,7 @@ describe('Gas test', () => {
         nf3Users[0].zkpKeys.compressedZkpPublicKey,
         0,
       );
-      eventLogs = await web3Client.waitForEvent(eventLogs, ['blockProposed']);
+      ({ eventLogs } = await web3Client.waitForEvent(eventLogs, ['blockProposed']));
       expect(gasCost).to.be.lessThan(expectedGasCostPerTx);
       console.log(
         'Double transfer L1 average gas used, if on-chain, was',
@@ -161,7 +161,7 @@ describe('Gas test', () => {
         0,
       );
       await nf3Users[0].makeBlockNow();
-      eventLogs = await web3Client.waitForEvent(eventLogs, ['blockProposed']);
+      ({ eventLogs } = await web3Client.waitForEvent(eventLogs, ['blockProposed']));
       expect(gasCost).to.be.lessThan(expectedGasCostPerTx);
       console.log('Withdraw L1 average gas used, if on-chain, was', averageL1GasCost(receipts));
     });