neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix prepare_masternodes/create_masternodes in DashTestFramework (#2382)

Browse Source 
Specify masternodeblsprivkey which is required in masternode mode now.
This should fix IS test failures which occur because of `Warning: You should specify a masternodeblsprivkey in the configuration. Please see documentation for help.` init error (there are other issues, so auto-IS test are still going to fail).
This commit is contained in:
UdjinM6 2018-10-26 08:03:48 +03:00 committed by Alexander Block
parent 733cd95123
commit 0692de1c58
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,8 +207,9 @@ MASTERNODE_COLLATERAL = 1000
class MasternodeInfo: class MasternodeInfo:
def __init__(self, key, collateral_id, collateral_out): def __init__(self, key, blsKey, collateral_id, collateral_out):
self.key = key self.key = key
self.blsKey = blsKey
self.collateral_id = collateral_id self.collateral_id = collateral_id
self.collateral_out = collateral_out self.collateral_out = collateral_out
@ -238,6 +239,7 @@ class DashTestFramework(BitcoinTestFramework):
def prepare_masternodes(self): def prepare_masternodes(self):
for idx in range(0, self.mn_count): for idx in range(0, self.mn_count):
key = self.nodes[0].masternode("genkey") key = self.nodes[0].masternode("genkey")
blsKey = self.nodes[0].bls('generate')['secret']
address = self.nodes[0].getnewaddress() address = self.nodes[0].getnewaddress()
txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL) txid = self.nodes[0].sendtoaddress(address, MASTERNODE_COLLATERAL)
txrow = self.nodes[0].getrawtransaction(txid, True) txrow = self.nodes[0].getrawtransaction(txid, True)
@ -248,7 +250,7 @@ class DashTestFramework(BitcoinTestFramework):
collateral_vout = vout_idx collateral_vout = vout_idx
self.nodes[0].lockunspent(False, self.nodes[0].lockunspent(False,
[{"txid": txid, "vout": collateral_vout}]) [{"txid": txid, "vout": collateral_vout}])
self.mninfo.append(MasternodeInfo(key, txid, collateral_vout)) self.mninfo.append(MasternodeInfo(key, blsKey, txid, collateral_vout))
def write_mn_config(self): def write_mn_config(self):
conf = self.get_mnconf_file() conf = self.get_mnconf_file()
@ -263,7 +265,8 @@ class DashTestFramework(BitcoinTestFramework):
def create_masternodes(self): def create_masternodes(self):
for idx in range(0, self.mn_count): for idx in range(0, self.mn_count):
args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1', args = ['-debug=masternode', '-externalip=127.0.0.1', '-masternode=1',
'-masternodeprivkey=%s' % self.mninfo[idx].key] + self.extra_args '-masternodeprivkey=%s' % self.mninfo[idx].key,
'-masternodeblsprivkey=%s' % self.mninfo[idx].blsKey] + self.extra_args
self.nodes.append(start_node(idx + 1, self.options.tmpdir, args)) self.nodes.append(start_node(idx + 1, self.options.tmpdir, args))
for i in range(0, idx + 1): for i in range(0, idx + 1):
connect_nodes(self.nodes[i], idx + 1) connect_nodes(self.nodes[i], idx + 1)