diff --git a/test/functional/abc-parkedchain.py b/test/functional/abc-parkedchain.py --- a/test/functional/abc-parkedchain.py +++ b/test/functional/abc-parkedchain.py @@ -127,7 +127,7 @@ # First, make sure both nodes are in sync. parking_node = self.nodes[1] - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) sync_blocks(self.nodes[0:2]) assert_equal(node.getbestblockhash(), parking_node.getbestblockhash()) diff --git a/test/functional/disconnect_ban.py b/test/functional/disconnect_ban.py --- a/test/functional/disconnect_ban.py +++ b/test/functional/disconnect_ban.py @@ -79,7 +79,7 @@ # Clear ban lists self.nodes[1].clearbanned() - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) self.log.info("Test disconnectnode RPCs") @@ -106,7 +106,7 @@ self.log.info("disconnectnode: successfully reconnect node") # reconnect the node - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) assert_equal(len(self.nodes[0].getpeerinfo()), 2) assert [node for node in self.nodes[0] .getpeerinfo() if node['addr'] == address1] diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py --- a/test/functional/fundrawtransaction.py +++ b/test/functional/fundrawtransaction.py @@ -24,10 +24,10 @@ def setup_network(self, split=False): self.setup_nodes() - 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) + connect_nodes_bi(self.nodes[0], self.nodes[1]) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[3]) def run_test(self): min_relay_tx_fee = self.nodes[0].getnetworkinfo()['relayfee'] @@ -467,10 +467,10 @@ for node in self.nodes: node.settxfee(min_relay_tx_fee) - 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) + connect_nodes_bi(self.nodes[0], self.nodes[1]) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[3]) self.sync_all() # drain the keypool diff --git a/test/functional/invalidateblock.py b/test/functional/invalidateblock.py --- a/test/functional/invalidateblock.py +++ b/test/functional/invalidateblock.py @@ -33,7 +33,7 @@ assert(self.nodes[1].getblockcount() == 6) self.log.info("Connect nodes to force a reorg") - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) sync_blocks(self.nodes[0:2]) assert(self.nodes[0].getblockcount() == 6) badhash = self.nodes[1].getblockhash(2) @@ -48,7 +48,7 @@ "Wrong tip for node0, hash %s, height %d" % (newhash, newheight)) self.log.info("\nMake sure we won't reorg to a lower work chain:") - connect_nodes_bi(self.nodes, 1, 2) + connect_nodes_bi(self.nodes[1], self.nodes[2]) self.log.info("Sync node 2 to node 1 so both have 6 blocks") sync_blocks(self.nodes[1:3]) assert(self.nodes[2].getblockcount() == 6) diff --git a/test/functional/keypool-topup.py b/test/functional/keypool-topup.py --- a/test/functional/keypool-topup.py +++ b/test/functional/keypool-topup.py @@ -38,7 +38,7 @@ shutil.copyfile(self.tmpdir + "/node1/regtest/wallet.dat", self.tmpdir + "/wallet.bak") self.start_node(1, self.extra_args[1]) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) self.log.info("Generate keys for wallet") @@ -65,7 +65,7 @@ self.log.info("Verify keypool is restored and balance is correct") self.start_node(1, self.extra_args[1]) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) self.sync_all() assert_equal(self.nodes[1].getbalance(), 15) diff --git a/test/functional/net.py b/test/functional/net.py --- a/test/functional/net.py +++ b/test/functional/net.py @@ -75,7 +75,7 @@ time.sleep(0.1) self.nodes[0].setnetworkactive(True) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) assert_equal(self.nodes[0].getnetworkinfo()['networkactive'], True) assert_equal(self.nodes[0].getnetworkinfo()['connections'], 2) diff --git a/test/functional/notifications.py b/test/functional/notifications.py --- a/test/functional/notifications.py +++ b/test/functional/notifications.py @@ -60,7 +60,7 @@ self.log.info("test -walletnotify after rescan") # restart node to rescan to force wallet notifications self.restart_node(1) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) wait_until(lambda: os.path.isfile(self.tx_filename) and os.stat( self.tx_filename).st_size >= (block_count * 65), timeout=10) diff --git a/test/functional/preciousblock.py b/test/functional/preciousblock.py --- a/test/functional/preciousblock.py +++ b/test/functional/preciousblock.py @@ -72,7 +72,7 @@ # Submit competing blocks via RPC so any reorg should occur before we # proceed (no way to wait on inaction for p2p sync) node_sync_via_rpc(self.nodes[0:2]) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) assert_equal(self.nodes[0].getbestblockhash(), hashC) assert_equal(self.nodes[1].getbestblockhash(), hashG) self.log.info("Make Node0 prefer block G") @@ -111,8 +111,8 @@ hashL = self.nodes[2].getbestblockhash() self.log.info("Connect nodes and check no reorg occurs") node_sync_via_rpc(self.nodes[1:3]) - connect_nodes_bi(self.nodes, 1, 2) - connect_nodes_bi(self.nodes, 0, 2) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) assert_equal(self.nodes[0].getbestblockhash(), hashH) assert_equal(self.nodes[1].getbestblockhash(), hashH) assert_equal(self.nodes[2].getbestblockhash(), hashL) diff --git a/test/functional/rawtransactions.py b/test/functional/rawtransactions.py --- a/test/functional/rawtransactions.py +++ b/test/functional/rawtransactions.py @@ -26,7 +26,7 @@ def setup_network(self, split=False): super().setup_network() - connect_nodes_bi(self.nodes, 0, 2) + connect_nodes_bi(self.nodes[0], self.nodes[2]) def run_test(self): # prepare some coins for multiple *rawtransaction commands diff --git a/test/functional/rest.py b/test/functional/rest.py --- a/test/functional/rest.py +++ b/test/functional/rest.py @@ -59,7 +59,7 @@ def setup_network(self, split=False): super().setup_network() - connect_nodes_bi(self.nodes, 0, 2) + connect_nodes_bi(self.nodes[0], self.nodes[2]) def run_test(self): url = urllib.parse.urlparse(self.nodes[0].url) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -210,7 +210,7 @@ # to split the network between nodes 1 and 2 to get # two halves that can work on competing chains. for i in range(self.num_nodes - 1): - connect_nodes_bi(self.nodes, i, i + 1) + connect_nodes_bi(self.nodes[i], self.nodes[i + 1]) self.sync_all() def setup_nodes(self): @@ -329,7 +329,7 @@ """ Join the (previously split) network halves together. """ - connect_nodes_bi(self.nodes, 1, 2) + connect_nodes_bi(self.nodes[1], self.nodes[2]) self.sync_all() def sync_all(self, node_groups=None): diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -402,9 +402,9 @@ time.sleep(0.1) -def connect_nodes_bi(nodes, a, b): - connect_nodes(nodes[a], nodes[b]) - connect_nodes(nodes[b], nodes[a]) +def connect_nodes_bi(a, b): + connect_nodes(a, b) + connect_nodes(b, a) def sync_blocks(rpc_connections, *, wait=1, timeout=60): diff --git a/test/functional/wallet.py b/test/functional/wallet.py --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -20,9 +20,9 @@ self.start_node(0) self.start_node(1) self.start_node(2) - 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], self.nodes[1]) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) self.sync_all([self.nodes[0:3]]) def check_fee_amount(self, curr_balance, balance_with_fee, fee_per_byte, tx_size): @@ -204,7 +204,7 @@ sync_mempools(self.nodes[0:2]) self.start_node(3) - connect_nodes_bi(self.nodes, 0, 3) + connect_nodes_bi(self.nodes[0], self.nodes[3]) sync_blocks(self.nodes) relayed = self.nodes[0].resendwallettransactions() @@ -253,9 +253,9 @@ self.start_node(0, ["-walletbroadcast=0"]) self.start_node(1, ["-walletbroadcast=0"]) self.start_node(2, ["-walletbroadcast=0"]) - 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], self.nodes[1]) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) self.sync_all([self.nodes[0:3]]) txIdNotBroadcasted = self.nodes[0].sendtoaddress( @@ -283,9 +283,9 @@ self.start_node(0) self.start_node(1) self.start_node(2) - 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], self.nodes[1]) + connect_nodes_bi(self.nodes[1], self.nodes[2]) + connect_nodes_bi(self.nodes[0], self.nodes[2]) sync_blocks(self.nodes[0:3]) self.nodes[0].generate(1) diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py --- a/test/functional/wallet_hd.py +++ b/test/functional/wallet_hd.py @@ -27,7 +27,7 @@ self.assert_start_raises_init_error( 1, ['-usehd=0'], 'already existing HD wallet') self.start_node(1) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) # Make sure we use hd, keep masterkeyid masterkeyid = self.nodes[1].getwalletinfo()['hdmasterkeyid'] @@ -89,7 +89,7 @@ assert_equal(hd_info_2["hdkeypath"], "m/0'/0'/" + str(_) + "'") assert_equal(hd_info_2["hdmasterkeyid"], masterkeyid) assert_equal(hd_add, hd_add_2) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) self.sync_all() # Needs rescan @@ -104,7 +104,7 @@ shutil.copyfile(os.path.join(tmpdir, "hd.bak"), os.path.join(tmpdir, "node1/regtest/wallet.dat")) self.start_node(1, extra_args=self.extra_args[1]) - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes[0], self.nodes[1]) self.sync_all() out = self.nodes[1].rescanblockchain(0, 1) assert_equal(out['start_height'], 0)