highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-26 00:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Add connect_nodes method

Browse Source
This commit is contained in:
MarcoFalke 2020-06-07 09:54:56 -04:00
parent fac6ef4fb2
commit fad676b8d2
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/test_framework/test_framework.py
View File

@ -353,9 +353,9 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
# See fPreferredDownload in net_processing. # See fPreferredDownload in net_processing.
# #
# If further outbound connections are needed, they can be added at the beginning of the test with e.g. # If further outbound connections are needed, they can be added at the beginning of the test with e.g.
# connect_nodes(self.nodes[1], 2) # self.connect_nodes(1, 2)
for i in range(self.num_nodes - 1): for i in range(self.num_nodes - 1):
connect_nodes(self.nodes[i + 1], i) self.connect_nodes(i + 1, i)
self.sync_all() self.sync_all()
def setup_nodes(self): def setup_nodes(self):
@ -532,11 +532,17 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
def wait_for_node_exit(self, i, timeout): def wait_for_node_exit(self, i, timeout):
self.nodes[i].process.wait(timeout) self.nodes[i].process.wait(timeout)
def connect_nodes(self, a, b):
connect_nodes(self.nodes[a], b)
def disconnect_nodes(self, a, b):
disconnect_nodes(self.nodes[a], b)
def split_network(self): def split_network(self):
""" """
Split the network of four nodes into nodes 0/1 and 2/3. Split the network of four nodes into nodes 0/1 and 2/3.
""" """
disconnect_nodes(self.nodes[1], 2) self.disconnect_nodes(1, 2)
self.sync_all(self.nodes[:2]) self.sync_all(self.nodes[:2])
self.sync_all(self.nodes[2:]) self.sync_all(self.nodes[2:])
@ -544,7 +550,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
""" """
Join the (previously split) network halves together. Join the (previously split) network halves together.
""" """
connect_nodes(self.nodes[1], 2) self.connect_nodes(1, 2)
self.sync_all() self.sync_all()
def sync_blocks(self, nodes=None, wait=1, timeout=60): def sync_blocks(self, nodes=None, wait=1, timeout=60):