aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xqa/rpc-tests/test_framework.py6
-rw-r--r--qa/rpc-tests/util.py4
2 files changed, 7 insertions, 3 deletions
diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py
index f226496d0f..1746294691 100755
--- a/qa/rpc-tests/test_framework.py
+++ b/qa/rpc-tests/test_framework.py
@@ -43,12 +43,12 @@ class BitcoinTestFramework(object):
# If we joined network halves, connect the nodes from the joint
# on outward. This ensures that chains are properly reorganised.
if not split:
- connect_nodes(self.nodes[2], 1)
+ connect_nodes_bi(self.nodes, 1, 2)
sync_blocks(self.nodes[1:2])
sync_mempools(self.nodes[1:2])
- connect_nodes(self.nodes[1], 0)
- connect_nodes(self.nodes[3], 2)
+ connect_nodes_bi(self.nodes, 0, 1)
+ connect_nodes_bi(self.nodes, 2, 3)
self.is_network_split = split
self.sync_all()
diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py
index 87baadc5d6..036ac577e6 100644
--- a/qa/rpc-tests/util.py
+++ b/qa/rpc-tests/util.py
@@ -194,6 +194,10 @@ def connect_nodes(from_connection, node_num):
while any(peer['version'] == 0 for peer in from_connection.getpeerinfo()):
time.sleep(0.1)
+def connect_nodes_bi(nodes, a, b):
+ connect_nodes(nodes[a], b)
+ connect_nodes(nodes[b], a)
+
def find_output(node, txid, amount):
"""
Return index to output of txid with value amount