Changed functional tests which do not require wallets to run without

skipping  .Addreses #14216. Changed get_deterministic_priv_key() to a

named tuple
This commit is contained in:
sanket1729
2018-09-15 04:32:12 -05:00
parent 3832c25f17
commit 0ca4c8b3c6
22 changed files with 58 additions and 107 deletions

View File

@@ -271,7 +271,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
assert str(e).startswith('Method not found')
continue
n.importprivkey(n.get_deterministic_priv_key()[1])
n.importprivkey(n.get_deterministic_priv_key().key)
def run_test(self):
"""Tests must override this method to define test logic"""
@@ -465,7 +465,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
for peer in range(4):
for j in range(25):
set_node_times(self.nodes, block_time)
self.nodes[peer].generatetoaddress(1, self.nodes[peer].get_deterministic_priv_key()[0])
self.nodes[peer].generatetoaddress(1, self.nodes[peer].get_deterministic_priv_key().address)
block_time += 10 * 60
# Must sync before next peer starts generating blocks
sync_blocks(self.nodes)