Fix test/00_tx_priority.js

config/node2.nethermind.json

@@ -43,7 +43,7 @@
   {
     "BlockAuthorAccount": "0x75df42383afe6bf5194aa8fa0e9b3d5f9e869441",
     "PasswordFiles": ["./config/password"],
-    "UnlockAccounts": ["0x75df42383afe6bf5194aa8fa0e9b3d5f9e869441"],
+    "UnlockAccounts": ["0x75df42383afe6bf5194aa8fa0e9b3d5f9e869441", "0x32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24"],
     "KeyStoreDirectory": "./data/node2/keys/DPoSChain"
   },
   "Mining":

config/node3.nethermind.json

@@ -43,7 +43,7 @@
   {
     "BlockAuthorAccount": "0x522df396ae70a058bd69778408630fdb023389b2",
     "PasswordFiles": ["./config/password"],
-    "UnlockAccounts": ["0x522df396ae70a058bd69778408630fdb023389b2"],
+    "UnlockAccounts": ["0x522df396ae70a058bd69778408630fdb023389b2", "0x32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24"],
     "KeyStoreDirectory": "./data/node3/keys/DPoSChain"
   },
   "Mining":

data/node2/keys/DPoSChain/0x32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24.json

@@ -0,0 +1 @@
+{"version":3,"id":"be60c5ac-6c4a-44c4-a12f-9558131ab64a","address":"32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24","Crypto":{"ciphertext":"68d1202b416408cb22ca60ba4f4deabcbddad7a262e014e1239dbe7354677ebb","cipherparams":{"iv":"a37afd65f955ab252340496defade99d"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"47fdc45755f6f75072fb8c1a1eea9ec3a06450754eb78f0cc726baef22fed0bf","n":8192,"r":8,"p":1},"mac":"00def76f42948515e1f498b433860ef4a0fca7f9ce7a81eee0abc470f365ceb7"}}

data/node3/keys/DPoSChain/0x32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24.json

@@ -0,0 +1 @@
+{"version":3,"id":"be60c5ac-6c4a-44c4-a12f-9558131ab64a","address":"32e4e4c7c5d1cea5db5f9202a9e4d99e56c91a24","Crypto":{"ciphertext":"68d1202b416408cb22ca60ba4f4deabcbddad7a262e014e1239dbe7354677ebb","cipherparams":{"iv":"a37afd65f955ab252340496defade99d"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"47fdc45755f6f75072fb8c1a1eea9ec3a06450754eb78f0cc726baef22fed0bf","n":8192,"r":8,"p":1},"mac":"00def76f42948515e1f498b433860ef4a0fca7f9ce7a81eee0abc470f365ceb7"}}

test/00_tx_priority.js

@@ -1,6 +1,8 @@
 const fs = require('fs');
 const Web3 = require('web3');
 const web3 = new Web3('http://localhost:8541');
+const web3_2 = new Web3('http://localhost:8542');
+const web3_3 = new Web3('http://localhost:8543');
 web3.eth.transactionConfirmationBlocks = 1;
 const constants = require('../utils/constants');
 const waitForNextStakingEpoch = require('../utils/waitForNextStakingEpoch');
@@ -1595,7 +1597,7 @@ describe('TxPriority tests', () => {
     await applyMinGasPrices('set', restrictionRules, null, node1);
     await applyMinGasPrices('set', restrictionRules, null, node3);
 
-    // Send test transactions in a single block
+    // Send test transactions to node2 in a single block
     let receipts = await sendTestTransactionsInSingleBlock(async () => {
       const ownerNonce = await web3.eth.getTransactionCount(OWNER);
       return [{
@@ -1627,7 +1629,7 @@ describe('TxPriority tests', () => {
           nonce: ownerNonce
         }
       }];
-    });
+    }, null, web3_2);
 
     // Check transactions order
     checkTransactionOrder([ // will fail on OpenEthereum
@@ -1648,7 +1650,7 @@ describe('TxPriority tests', () => {
     await applyMinGasPrices('remove', restrictionRules, null, node3);
     await applyMinGasPrices('set', restrictionRules, null, node2);
 
-    // Send test transactions in a single block
+    // Send test transactions to node3 in a single block
     receipts = await sendTestTransactionsInSingleBlock(async () => {
       const ownerNonce = await web3.eth.getTransactionCount(OWNER);
       return [{
@@ -1680,7 +1682,7 @@ describe('TxPriority tests', () => {
           gasPrice: gasPrice1 // 1 GWei
         })).rawTransaction
       }];
-    });
+    }, null, web3_3);
 
     // Check transactions order
     checkTransactionOrder([ // will fail on OpenEthereum
@@ -1850,7 +1852,7 @@ describe('TxPriority tests', () => {
     }
   }
 
-  async function batchSendTransactions(transactions, ensureSingleBlock, receiptsExpected) {
+  async function batchSendTransactions(transactions, ensureSingleBlock, receiptsExpected, web3Local) {
     // Estimate gas for each transaction
     const promises = [];
     transactions.forEach(item => {
@@ -1873,7 +1875,7 @@ describe('TxPriority tests', () => {
     });
     const gas = await Promise.all(promises);
 
-    const receipts = await executeTransactions(transactions, gas, receiptsExpected);
+    const receipts = await executeTransactions(transactions, gas, receiptsExpected, web3Local);
 
     if (ensureSingleBlock && transactions.length > 0) {
       // Ensure the transactions were mined in the same block
@@ -1961,7 +1963,7 @@ describe('TxPriority tests', () => {
     }
   }
 
-  async function executeTransactions(transactions, gas, receiptsExpected) {
+  async function executeTransactions(transactions, gas, receiptsExpected, web3Local) {
     const promises = [];
 
     let receiptsReceived = 0;
@@ -1969,8 +1971,10 @@ describe('TxPriority tests', () => {
       receiptsExpected = transactions.length;
     }
 
+    web3Local = web3Local || web3;
+
     // Prepare transactions for sending in batch
-    let batch = new web3.BatchRequest();
+    let batch = new web3Local.BatchRequest();
     transactions.forEach((item, index) => {
       const arguments = item.arguments;
       let send;
@@ -1994,7 +1998,7 @@ describe('TxPriority tests', () => {
             // Wait for the receipt during 30 seconds
             while (receipt == null && attempts++ <= 60 && receiptsReceived < receiptsExpected) {
               await sleep(500);
-              receipt = await web3.eth.getTransactionReceipt(txHash);
+              receipt = await web3Local.eth.getTransactionReceipt(txHash);
               if (receipt) receiptsReceived++;
             }
             resolve(receipt);
@@ -2025,8 +2029,8 @@ describe('TxPriority tests', () => {
     return blockNumber;
   }
 
-  async function sendTestTransactionsInSingleBlock(getTransactions, receiptsExpected) {
-    let results = await batchSendTransactions(await getTransactions(), true, receiptsExpected);
+  async function sendTestTransactionsInSingleBlock(getTransactions, receiptsExpected, web3Local) {
+    let results = await batchSendTransactions(await getTransactions(), true, receiptsExpected, web3Local);
 
     let receiptsInDifferentBlocks = null;
     if (!results.singleBlock) {
@@ -2036,7 +2040,7 @@ describe('TxPriority tests', () => {
     for (let t = 0; t < 10 && !results.singleBlock; t++) {
       console.log('      Transactions were not mined in the same block. Retrying...');
       console.log('      Receipts:', JSON.stringify(results.receipts));
-      results = await batchSendTransactions(await getTransactions(), true, receiptsExpected);
+      results = await batchSendTransactions(await getTransactions(), true, receiptsExpected, web3Local);
     }
     if (!results.singleBlock) {
       expect(false, 'Transactions were not mined in the same block').to.equal(true);