Fix occasionally failing tests (#2691)

* Remove gen from updatemasternode test * Sync blocks when generating on different nodes * Sync blocks between nodes * Use const and reference to prevent counter increment * Remove unused txindex usage * Remove redundant check * Restore build for make.sh users
DeFiCh · Nov 20, 2023 · b454061 · b454061
1 parent fa1aca8
commit b454061
Show file tree

Hide file tree

Showing 61 changed files with 53 additions and 122 deletions.
diff --git a/src/dfi/mn_rpc.cpp b/src/dfi/mn_rpc.cpp
@@ -469,7 +469,7 @@ std::vector<CTxIn> GetAuthInputsSmart(CWalletCoinsUnlocker &pwallet,
     return result;
 }
 
-void execTestTx(const CTransaction &tx, uint32_t height, CTransactionRef optAuthTx) {
+void execTestTx(const CTransaction &tx, const uint32_t height, const CTransactionRef &optAuthTx) {
     std::vector<unsigned char> metadata;
     auto txType = GuessCustomTxType(tx, metadata);
     auto txMessage = customTypeToMessage(txType);

diff --git a/src/dfi/mn_rpc.h b/src/dfi/mn_rpc.h
@@ -93,7 +93,7 @@ CAccounts GetAllMineAccounts(CWallet *const pwallet);
 CAccounts SelectAccountsByTargetBalances(const CAccounts &accounts,
                                          const CBalances &targetBalances,
                                          AccountSelectionMode selectionMode);
-void execTestTx(const CTransaction &tx, uint32_t height, CTransactionRef optAuthTx = {});
+void execTestTx(const CTransaction &tx, const uint32_t height, const CTransactionRef &optAuthTx = {});
 CScript CreateScriptForHTLC(const JSONRPCRequest &request, uint32_t &blocks, std::vector<unsigned char> &image);
 CPubKey PublickeyFromString(const std::string &pubkey);
 std::optional<CScript> AmIFounder(CWallet *const pwallet);

diff --git a/test/functional/feature_address_map.py b/test/functional/feature_address_map.py
@@ -37,7 +37,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
             [
                 "-dummypos=0",
@@ -55,7 +54,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_anchor_rewards.py b/test/functional/feature_anchor_rewards.py
@@ -518,7 +518,7 @@ def run_test(self):
 
         # check confirmations (revoting) after node restart:
         self.stop_node(0)
-        self.start_node(0, ["-txindex=1", "-amkheight=0", "-dakotaheight=1"])
+        self.start_node(0, ["-amkheight=0", "-dakotaheight=1"])
         connect_nodes_bi(self.nodes, 0, 1)
         self.sync_blocks(self.nodes[0:2])
         wait_until(

diff --git a/test/functional/feature_auth_return_change.py b/test/functional/feature_auth_return_change.py
@@ -17,7 +17,6 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.extra_args = [
             [
-                "-txindex=1",
                 "-txnotokens=0",
                 "-amkheight=50",
                 "-bayfrontheight=50",
@@ -37,12 +36,14 @@ def clear_auth_utxos(self):
     # Check output/input count and addresses are expected
     def check_auto_auth_txs(self, tx, owner, outputs=2):
         # Get auto auth TXs
-        final_rawtx = self.nodes[0].getrawtransaction(tx, 1)
-        auth_tx = self.nodes[0].getrawtransaction(final_rawtx["vin"][0]["txid"], 1)
+        get_tx = self.nodes[0].gettransaction(tx)["hex"]
+        final_rawtx = self.nodes[0].decoderawtransaction(get_tx)
+        get_tx = self.nodes[0].gettransaction(final_rawtx["vin"][0]["txid"])["hex"]
+        auth_tx = self.nodes[0].decoderawtransaction(get_tx)
 
         # Auth TX outputs all belong to auth address
         assert_equal(auth_tx["vout"][1]["scriptPubKey"]["addresses"][0], owner)
-        decTx = self.nodes[0].getrawtransaction(tx)
+        decTx = self.nodes[0].gettransaction(tx)["hex"]
         customTx = self.nodes[0].decodecustomtx(decTx)
         vouts = 2
         if customTx["type"] == "ResignMasternode":
@@ -166,7 +167,8 @@ def run_test(self):
         self.nodes[0].generate(1, 1000000, coinbase)
 
         # Change to pool collateral address
-        final_rawtx = self.nodes[0].getrawtransaction(poolpair_tx, 1)
+        get_tx = self.nodes[0].gettransaction(poolpair_tx)["hex"]
+        final_rawtx = self.nodes[0].decoderawtransaction(get_tx)
         assert_equal(
             final_rawtx["vout"][1]["scriptPubKey"]["addresses"][0],
             self.nodes[0].PRIV_KEYS[0].ownerAuthAddress,
@@ -299,7 +301,8 @@ def run_test(self):
         assert_equal(token_c, "2")
 
         # Check auto auth TX
-        final_rawtx = self.nodes[0].getrawtransaction(create_tx, 1)
+        get_tx = self.nodes[0].gettransaction(create_tx)["hex"]
+        final_rawtx = self.nodes[0].decoderawtransaction(get_tx)
         assert_equal(
             final_rawtx["vout"][2]["scriptPubKey"]["addresses"][0],
             self.nodes[0].PRIV_KEYS[0].ownerAuthAddress,

diff --git a/test/functional/feature_consortium.py b/test/functional/feature_consortium.py
@@ -32,7 +32,6 @@ def set_test_params(self):
                 "-grandcentralheight=254",
                 "-grandcentralepilogueheight=350",
                 "-regtest-minttoken-simulate-mainnet=1",
-                "-txindex=1",
             ],
             [
                 "-txnotokens=0",
@@ -50,7 +49,6 @@ def set_test_params(self):
                 "-grandcentralheight=254",
                 "-grandcentralepilogueheight=350",
                 "-regtest-minttoken-simulate-mainnet=1",
-                "-txindex=1",
             ],
             [
                 "-txnotokens=0",
@@ -68,7 +66,6 @@ def set_test_params(self):
                 "-grandcentralheight=254",
                 "-grandcentralepilogueheight=350",
                 "-regtest-minttoken-simulate-mainnet=1",
-                "-txindex=1",
             ],
             [
                 "-txnotokens=0",
@@ -86,7 +83,6 @@ def set_test_params(self):
                 "-grandcentralheight=254",
                 "-grandcentralepilogueheight=350",
                 "-regtest-minttoken-simulate-mainnet=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_dusd_loans.py b/test/functional/feature_dusd_loans.py
@@ -55,7 +55,6 @@ def set_test_params(self):
                 f"-grandcentralepilogueheight={self.grandcentralepilogueheight}",
                 f"-metachainheight={self.metachainheight}",
                 "-jellyfish_regtest=1",
-                "-txindex=1",
                 "-simulatemainnet=1",
             ]
         ]

diff --git a/test/functional/feature_evm.py b/test/functional/feature_evm.py
@@ -40,7 +40,6 @@ def set_test_params(self):
             "-grandcentralheight=101",
             "-metachainheight=105",
             "-subsidytest=1",
-            "-txindex=1",
             "-ethdebug=1",
         ]
         self.extra_args = [args, args]

diff --git a/test/functional/feature_evm_contract_env_vars.py b/test/functional/feature_evm_contract_env_vars.py
@@ -33,7 +33,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_contracts.py b/test/functional/feature_evm_contracts.py
@@ -35,7 +35,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_dfi_intrinsics.py b/test/functional/feature_evm_dfi_intrinsics.py
@@ -36,7 +36,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_dst20.py b/test/functional/feature_evm_dst20.py
@@ -43,7 +43,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ]
         ]
 

diff --git a/test/functional/feature_evm_eip1559_fees.py b/test/functional/feature_evm_eip1559_fees.py
@@ -38,7 +38,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ]
         ]
 

diff --git a/test/functional/feature_evm_fee.py b/test/functional/feature_evm_fee.py
@@ -34,7 +34,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_gas.py b/test/functional/feature_evm_gas.py
@@ -36,7 +36,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_genesis.py b/test/functional/feature_evm_genesis.py
@@ -38,7 +38,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 
@@ -141,7 +140,6 @@ def test_start_state_from_json(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
         self.stop_nodes()

diff --git a/test/functional/feature_evm_logs.py b/test/functional/feature_evm_logs.py
@@ -37,7 +37,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_mempool.py b/test/functional/feature_evm_mempool.py
@@ -35,7 +35,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
                 "-ethdebug=1",
             ],
         ]

diff --git a/test/functional/feature_evm_miner.py b/test/functional/feature_evm_miner.py
@@ -38,7 +38,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_proxy.py b/test/functional/feature_evm_proxy.py
@@ -34,7 +34,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_rollback.py b/test/functional/feature_evm_rollback.py
@@ -31,7 +31,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
                 "-ethdebug=1",
             ],
         ]

diff --git a/test/functional/feature_evm_rpc.py b/test/functional/feature_evm_rpc.py
@@ -40,7 +40,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
                 "-ethdebug=1",
             ],
         ]
@@ -358,8 +357,9 @@ def test_block(self):
         self.nodes[0].generate(1)
 
         # Test evm tx RPC
-        block = self.nodes[0].getblock(self.nodes[0].getbestblockhash())
-        res = self.nodes[0].getcustomtx(block["tx"][1])
+        block_hash = self.nodes[0].getbestblockhash()
+        block = self.nodes[0].getblock(block_hash)
+        res = self.nodes[0].getcustomtx(block["tx"][1], block_hash)
         assert_equal(
             res["results"]["hash"],
             "8c99e9f053e033078e33c2756221f38fd529b914165090a615f27961de687497",

diff --git a/test/functional/feature_evm_rpc_fee_history.py b/test/functional/feature_evm_rpc_fee_history.py
@@ -42,7 +42,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_rpc_filters.py b/test/functional/feature_evm_rpc_filters.py
@@ -37,7 +37,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_rpc_transaction.py b/test/functional/feature_evm_rpc_transaction.py
@@ -45,7 +45,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
                 "-ethdebug=1",
             ],
         ]

diff --git a/test/functional/feature_evm_smart_contract.py b/test/functional/feature_evm_smart_contract.py
@@ -33,7 +33,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_transaction_replacement.py b/test/functional/feature_evm_transaction_replacement.py
@@ -41,7 +41,6 @@ def set_test_params(self):
                 "-grandcentralheight=101",
                 "-metachainheight=105",
                 "-subsidytest=1",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_evm_transferdomain.py b/test/functional/feature_evm_transferdomain.py
@@ -54,7 +54,6 @@ def set_test_params(self):
             "-grandcentralheight=101",
             "-metachainheight=150",
             "-subsidytest=1",
-            "-txindex=1",
         ]
         self.extra_args = [node_args, node_args]
 

diff --git a/test/functional/feature_evm_vmmap_rpc.py b/test/functional/feature_evm_vmmap_rpc.py
@@ -40,7 +40,6 @@ def set_test_params(self):
             "-grandcentralheight=101",
             "-metachainheight=105",
             "-subsidytest=1",
-            "-txindex=1",
         ]
         self.extra_args = [extra_args, extra_args]
 

diff --git a/test/functional/feature_higher_collateral_factor.py b/test/functional/feature_higher_collateral_factor.py
@@ -23,7 +23,6 @@ def set_test_params(self):
                 "-bayfrontheight=1",
                 "-bayfrontgardensheight=1",
                 "-eunosheight=1",
-                "-txindex=1",
                 "-fortcanningheight=1",
                 "-fortcanningroadheight=1",
                 "-fortcanninghillheight=1",

diff --git a/test/functional/feature_icx_orderbook_errors.py b/test/functional/feature_icx_orderbook_errors.py
@@ -24,15 +24,13 @@ def set_test_params(self):
                 "-bayfrontheight=50",
                 "-eunosheight=50",
                 "-eunospayaheight=50",
-                "-txindex=1",
             ],
             [
                 "-txnotokens=0",
                 "-amkheight=50",
                 "-bayfrontheight=50",
                 "-eunosheight=50",
                 "-eunospayaheight=50",
-                "-txindex=1",
             ],
         ]
 

diff --git a/test/functional/feature_loan.py b/test/functional/feature_loan.py
@@ -26,7 +26,6 @@ def set_test_params(self):
                 "-bayfrontheight=1",
                 "-bayfrontgardensheight=1",
                 "-eunosheight=1",
-                "-txindex=1",
                 "-fortcanningheight=1",
             ],
             [
@@ -35,7 +34,6 @@ def set_test_params(self):
                 "-bayfrontheight=1",
                 "-bayfrontgardensheight=1",
                 "-eunosheight=1",
-                "-txindex=1",
                 "-fortcanningheight=1",
             ],
         ]

diff --git a/test/functional/feature_loan_auctions.py b/test/functional/feature_loan_auctions.py
@@ -24,7 +24,6 @@ def set_test_params(self):
                 "-amkheight=1",
                 "-bayfrontheight=1",
                 "-eunosheight=1",
-                "-txindex=1",
                 "-fortcanningheight=1",
             ]
         ]

diff --git a/test/functional/feature_loan_basics.py b/test/functional/feature_loan_basics.py
@@ -28,7 +28,6 @@ def set_test_params(self):
                 "-fortcanningheight=50",
                 "-eunosheight=50",
                 "-fortcanninghillheight=220",
-                "-txindex=1",
             ],
             [
                 "-txnotokens=0",
@@ -37,7 +36,6 @@ def set_test_params(self):
                 "-bayfrontgardensheight=1",
                 "-fortcanningheight=50",
                 "-eunosheight=50",
-                "-txindex=1",
             ],
         ]