zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5237 

2db4c8a Fix node ranges in the test framework. (Daniel Kraft)
This commit is contained in:
Wladimir J. van der Laan 2014-11-17 17:20:23 +01:00
parent 1f0436f8cb 2db4c8a24d
commit 20e4f654f5
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qa/rpc-tests/test_framework.py
View File

@ -44,8 +44,8 @@ class BitcoinTestFramework(object):
# on outward. This ensures that chains are properly reorganised.
if not split:
connect_nodes_bi(self.nodes, 1, 2)
sync_blocks(self.nodes[1:2])
sync_mempools(self.nodes[1:2])
sync_blocks(self.nodes[1:3])
sync_mempools(self.nodes[1:3])
connect_nodes_bi(self.nodes, 0, 1)
connect_nodes_bi(self.nodes, 2, 3)
@ -63,9 +63,9 @@ class BitcoinTestFramework(object):
def sync_all(self):
if self.is_network_split:
sync_blocks(self.nodes[:1])
sync_blocks(self.nodes[:2])
sync_blocks(self.nodes[2:])
sync_mempools(self.nodes[:1])
sync_mempools(self.nodes[:2])
sync_mempools(self.nodes[2:])
else:
sync_blocks(self.nodes)