Browse Source

Work around #5113.

tags/v0.15.1
Daniel Kraft 6 years ago
parent
commit
2290ed01bc
2 changed files with 7 additions and 3 deletions
  1. 3
    3
      qa/rpc-tests/test_framework.py
  2. 4
    0
      qa/rpc-tests/util.py

+ 3
- 3
qa/rpc-tests/test_framework.py View File

@@ -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()


+ 4
- 0
qa/rpc-tests/util.py View File

@@ -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

Loading…
Cancel
Save