Other fixes

Author: UdjinM6

test/functional/dip3-deterministicmns.py

@@ -26,6 +26,8 @@ def __init__(self):
         self.extra_args += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"]
         self.extra_args += ["-dip3params=135:150"]
 
+
+    def setup_network(self):
         disable_mocktime()
         self.start_controller_node()
 

test/functional/fundrawtransaction-hd.py

@@ -13,18 +13,15 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 4
+        self.extra_args = [['-usehd=1']] * self.num_nodes
 
-    def setup_network(self, split=False):
-        self.nodes = start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout)
-
+    def setup_network(self):
+        self.setup_nodes(stderr=sys.stdout)
         connect_nodes_bi(self.nodes,0,1)
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
         connect_nodes_bi(self.nodes,0,3)
 
-        self.is_network_split=False
-        self.sync_all()
-
     def run_test(self):
         self.log.info("Mining blocks...")
 
@@ -456,7 +453,6 @@ def run_test(self):
         connect_nodes_bi(self.nodes,1,2)
         connect_nodes_bi(self.nodes,0,2)
         connect_nodes_bi(self.nodes,0,3)
-        self.is_network_split=False
         self.sync_all()
 
         # drain the keypool

test/functional/fundrawtransaction.py

@@ -21,9 +21,10 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 4
+        self.extra_args = [['-usehd=0']] * self.num_nodes
 
     def setup_network(self, split=False):
-        self.setup_nodes([['-usehd=0']] * self.num_nodes)
+        self.setup_nodes()
 
         connect_nodes_bi(self.nodes, 0, 1)
         connect_nodes_bi(self.nodes, 1, 2)

test/functional/listtransactions.py

@@ -23,7 +23,7 @@ def __init__(self):
 
     def setup_nodes(self):
         #This test requires mocktime
-        enable_mocktime()
+        set_cache_mocktime()
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
 
     def run_test(self):

test/functional/p2p-compactblocks.py

@@ -95,7 +95,7 @@ def __init__(self):
         self.setup_clean_chain = True
         # both nodes has the same version
         self.num_nodes = 2
-        self.extra_args = [["-txindex"]]
+        self.extra_args = [["-txindex"]] * 2
         self.utxos = []
 
     def build_block_on_tip(self, node):

test/functional/p2p-fingerprint.py

@@ -40,11 +40,6 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
 
-    # TODO also remove this when bitcoin#11121 is backported
-    def setup_network(self, split=False):
-        self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
-        self.is_network_split = False
-
     # Build a chain of blocks on top of given one
     def build_chain(self, nblocks, prev_hash, prev_height, prev_median_time):
         blocks = []

test/functional/prioritise_transaction.py

@@ -14,7 +14,7 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 2
-        self.extra_args = [["-printpriority=1"] * 2]
+        self.extra_args = [["-printpriority=1"]] * 2
 
     def run_test(self):
         self.txouts = gen_return_txouts()

test/functional/receivedby.py

@@ -31,7 +31,7 @@ def __init__(self):
 
     def setup_nodes(self):
         #This test requires mocktime
-        enable_mocktime()
+        set_cache_mocktime()
         self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
 
     def run_test(self):

test/functional/test_framework/test_framework.py

@@ -17,25 +17,29 @@
 from concurrent.futures import ThreadPoolExecutor
 
 from .util import (
-    assert_equal,
-    start_nodes,
     PortSeed,
+    GENESISTIME,
     MAX_NODES,
+    assert_equal,
     bitcoind_processes,
     check_json_precision,
     connect_nodes_bi,
     connect_nodes,
+    copy_datadir,
     disable_mocktime,
     disconnect_nodes,
     enable_coverage,
-    enable_mocktime,
     get_mocktime,
     get_rpc_proxy,
     initialize_datadir,
     log_filename,
     p2p_port,
     rpc_url,
+    set_cache_mocktime,
+    set_genesis_mocktime,
+    set_mocktime,
     set_node_times,
+    satoshi_round,
     start_node,
     start_nodes,
     stop_node,
@@ -44,15 +48,7 @@
     sync_mempools,
     sync_masternodes,
     wait_for_bitcoind_start,
-    set_cache_mocktime,
-    set_genesis_mocktime,
-    get_mocktime,
-    set_mocktime,
-    set_node_times,
-    p2p_port,
-    satoshi_round,
-    wait_to_sync,
-    copy_datadir)
+    wait_to_sync)
 from .authproxy import JSONRPCException
 
 class BitcoinTestFramework(object):

test/functional/wallet-accounts.py

@@ -25,15 +25,15 @@ def __init__(self):
         super().__init__()
         self.setup_clean_chain = True
         self.num_nodes = 1
-        self.extra_args = [[]]
+        self.extra_args = [["-paytxfee=0.0001"]]
 
     def run_test(self):
         node = self.nodes[0]
         # Check that there's no UTXO on any of the nodes
         assert_equal(len(node.listunspent()), 0)
 
         # Note each time we call generate, all generated coins go into
-        # the same address, so we call twice to get two addresses w/50 each
+        # the same address, so we call twice to get two addresses w/500 each
         node.generate(1)
         node.generate(101)
         assert_equal(node.getbalance(), 1000)
@@ -57,9 +57,11 @@ def run_test(self):
         common_address = "yd5KMREs3GLMe6mTJYr3YrH1juwNwrFCfB"
         txid = node.sendmany(
             fromaccount="",
-            amounts={common_address: 100},
-            subtractfeefrom=[common_address],
+            amounts={common_address: 1000},
             minconf=1,
+            addlocked=False,
+            comment="",
+            subtractfeefrom=[common_address],
         )
         tx_details = node.gettransaction(txid)
         fee = -tx_details['details'][0]['fee']