01-04-54-post-iris-call-receive-headers / 01-04-55-post-iris-call-receive-header

lib/tests/post_iris_call_receive_header.js → lib/tests/call_receive_header.js

@@ -9,6 +9,9 @@ let rskTxHelper;
 let btcTxHelper;
 let bridge;
 
+const HEADER_RECEIVED_OK = 0;
+const RECEIVE_HEADER_CALLED_TOO_SOON = "-1";
+
 const fulfillRequirementsToRunAsSingleTestFile = async () => {
     const forkName = process.env.FORK_NAME || getLatestForkName().name;
     await activateFork(Runners.common.forks[forkName]);
@@ -36,12 +39,11 @@ const execute = (description, getRskHost) => {
             const blockHeader = await btcTxHelper.getBlockHeader(blockHashes[0], false);
             const blockchainInitialHeigth = await bridge.methods.getBtcBlockchainBestChainHeight().call();
 
-            await sendTxWithCheck(
-                rskTxHelper,
-                bridge.methods.receiveHeader(ensure0x(blockHeader)),
-                cowAddress,
-                (result) => { expect(Number(result)).to.be.equal(0) }
-            );
+            const receiveHeaderMethodCall = bridge.methods.receiveHeader(ensure0x(blockHeader));
+            const checkCallback = (result) => { expect(Number(result)).to.be.equal(HEADER_RECEIVED_OK) };
+
+            await sendTxWithCheck(rskTxHelper, receiveHeaderMethodCall, cowAddress, checkCallback);
+
             const blockchainFinalHeight = await bridge.methods.getBtcBlockchainBestChainHeight().call();
             expect(Number(blockchainFinalHeight)).to.be.equal(Number(blockchainInitialHeigth) + 1);
         });
@@ -50,7 +52,7 @@ const execute = (description, getRskHost) => {
             const blockHashes = await btcTxHelper.mine();
             const blockHeader = await btcTxHelper.getBlockHeader(blockHashes[0], false);
             const result = await bridge.methods.receiveHeader(ensure0x(blockHeader)).call();
-            expect(result).to.be.equal('-1');
+            expect(result).to.be.equal(RECEIVE_HEADER_CALLED_TOO_SOON);
             }
         );
     });
@@ -59,5 +61,3 @@ const execute = (description, getRskHost) => {
 module.exports = {
     execute,
 };
-
-

lib/tests/post_iris_call_receive_headers.js → lib/tests/call_receive_headers.js

@@ -2,7 +2,7 @@ const expect = require('chai').expect;
 const { getRskTransactionHelper } = require('../rsk-tx-helper-provider');
 const { getBtcClient } = require('../btc-client-provider');
 const { getBridge, getLatestActiveForkName } = require('../precompiled-abi-forks-util');
-const { activateFork, sendTxWithCheck, getLatestForkName } = require('../rsk-utils');
+const { activateFork, sendTxWithCheck, getLatestForkName, waitAndUpdateBridge } = require('../rsk-utils');
 const { ensure0x } = require('../utils');
 
 let rskTxHelper;
@@ -30,17 +30,16 @@ const execute = (description, getRskHost) => {
 
       it('Calling receiveHeaders method with regular user should not increment BTC blockchain size', async () => {
         const bridge = getBridge(rskTxHelper.getClient(), await getLatestActiveForkName());
+        await waitAndUpdateBridge(rskTxHelper);
+
         const blockNumberInitial = await bridge.methods.getBtcBlockchainBestChainHeight().call();
         const cowAddress = await rskTxHelper.newAccountWithSeed('cow');
         const blockHashes = await btcTxHelper.mine();
         const blockHeader = await btcTxHelper.getBlockHeader(blockHashes[0], false);
 
-        await sendTxWithCheck(
-          rskTxHelper,
-          bridge.methods.receiveHeaders([ensure0x(blockHeader)]),
-          cowAddress,
-          (result) => { expect(result).to.be.empty }
-        );
+        const receiveHeadersMethodCall = bridge.methods.receiveHeaders([ensure0x(blockHeader)]);
+        const checkCallback = (result) => { expect(result).to.be.empty };
+        await sendTxWithCheck(rskTxHelper, receiveHeadersMethodCall, cowAddress, checkCallback);
 
         const blockNumberFinal = await bridge.methods.getBtcBlockchainBestChainHeight().call();
         expect(blockNumberInitial).to.be.equal(blockNumberFinal);

tests/01_04_54-post_iris_call_receive_headers.js

@@ -1,3 +1,3 @@
-const twoWpTests = require('../lib/tests/post_iris_call_receive_headers');
+const receiveHeadersTests = require('../lib/tests/call_receive_headers');
 
-twoWpTests.execute('Calling receiveHeaders after iris300', () => Runners.hosts.federate.host);
+receiveHeadersTests.execute('Calling receiveHeaders after iris300', () => Runners.hosts.federate.host);

tests/01_04_55-post_iris_call_receive_header.js

@@ -1,3 +1,3 @@
-const twoWpTests = require('../lib/tests/post_iris_call_receive_header');
+const receiveHeaderTests = require('../lib/tests/call_receive_header');
 
-twoWpTests.execute('Calling receiveHeader after iris300', () => Runners.hosts.federate.host);
+receiveHeaderTests.execute('Calling receiveHeader after iris300', () => Runners.hosts.federate.host);

tests/03_00_02-last_fork_active_call_receive_headers.js

@@ -0,0 +1,3 @@
+const receiveHeadersTests = require('../lib/tests/call_receive_headers');
+
+receiveHeadersTests.execute('Calling receiveHeaders last fork is active', () => Runners.hosts.federate.host);

tests/03_00_03-last_fork_active_call_receive_header.js

@@ -0,0 +1,3 @@
+const receiveHeaderTests = require('../lib/tests/call_receive_header');
+
+receiveHeaderTests.execute('Calling receiveHeader last fork is active', () => Runners.hosts.federate.host);

tests/05_00_02-last_fork_active_call_receive_headers.js

@@ -0,0 +1,3 @@
+const receiveHeadersTests = require('../lib/tests/call_receive_headers');
+
+receiveHeadersTests.execute('Calling receiveHeaders after federation change', () => Runners.hosts.federate.host);

tests/05_00_03-last_fork_active_call_receive_header.js

@@ -0,0 +1,3 @@
+const receiveHeaderTests = require('../lib/tests/call_receive_header');
+
+receiveHeaderTests.execute('Calling receiveHeader after federation change', () => Runners.hosts.federates[Runners.hosts.federates.length - 1].host);