sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow calling start_masternode from outside of start_masternodes

Browse Source
This commit is contained in:
Alexander Block 2020-03-30 11:28:05 +02:00
parent 41796bec06
commit 535698d31f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,13 +606,6 @@ class DashTestFramework(BitcoinTestFramework):
self.add_nodes(self.mn_count) self.add_nodes(self.mn_count)
executor = ThreadPoolExecutor(max_workers=20) executor = ThreadPoolExecutor(max_workers=20)
def do_start(idx):
args = ['-masternodeblsprivkey=%s' % self.mninfo[idx].keyOperator] + self.extra_args[idx + start_idx]
self.start_node(idx + start_idx, extra_args=args)
self.mninfo[idx].nodeIdx = idx + start_idx
self.mninfo[idx].node = self.nodes[idx + start_idx]
force_finish_mnsync(self.mninfo[idx].node)
def do_connect(idx): def do_connect(idx):
# Connect to the control node only, masternodes should take care of intra-quorum connections themselves # Connect to the control node only, masternodes should take care of intra-quorum connections themselves
connect_nodes(self.mninfo[idx].node, 0) connect_nodes(self.mninfo[idx].node, 0)
@ -621,7 +614,8 @@ class DashTestFramework(BitcoinTestFramework):
# start up nodes in parallel # start up nodes in parallel
for idx in range(0, self.mn_count): for idx in range(0, self.mn_count):
jobs.append(executor.submit(do_start, idx)) self.mninfo[idx].nodeIdx = idx + start_idx
jobs.append(executor.submit(self.start_masternode, self.mninfo[idx]))
# wait for all nodes to start up # wait for all nodes to start up
for job in jobs: for job in jobs:
@ -639,6 +633,14 @@ class DashTestFramework(BitcoinTestFramework):
executor.shutdown() executor.shutdown()
def start_masternode(self, mninfo, extra_args=None):
args = ['-masternodeblsprivkey=%s' % mninfo.keyOperator] + self.extra_args[mninfo.nodeIdx]
if extra_args is not None:
args += extra_args
self.start_node(mninfo.nodeIdx, extra_args=args)
mninfo.node = self.nodes[mninfo.nodeIdx]
force_finish_mnsync(mninfo.node)
def setup_network(self): def setup_network(self):
self.log.info("Creating and starting controller node") self.log.info("Creating and starting controller node")
self.add_nodes(1, extra_args=[self.extra_args[0]]) self.add_nodes(1, extra_args=[self.extra_args[0]])