Use TestNode.node_encrypt_wallet

This commit is contained in:
Alexander Block 2019-09-23 21:31:13 +02:00
parent cc124c99c7
commit 96966e5b89
2 changed files with 2 additions and 4 deletions

View File

@ -442,9 +442,8 @@ class RawTransactionsTest(BitcoinTestFramework):
self.stop_node(0) self.stop_node(0)
self.stop_node(2) self.stop_node(2)
self.stop_node(3) self.stop_node(3)
self.nodes[1].encryptwallet("test") self.nodes[1].node_encrypt_wallet("test")
self.nodes.pop(1) self.nodes.pop(1)
self.wait_node(1)
self.nodes = self.start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout) self.nodes = self.start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout)
# This test is not meant to test fee estimation and we'd like # This test is not meant to test fee estimation and we'd like

View File

@ -27,8 +27,7 @@ class KeyPoolTest(BitcoinTestFramework):
assert(addr_before_encrypting_data['hdchainid'] == wallet_info_old['hdchainid']) assert(addr_before_encrypting_data['hdchainid'] == wallet_info_old['hdchainid'])
# Encrypt wallet and wait to terminate # Encrypt wallet and wait to terminate
nodes[0].encryptwallet('test') nodes[0].node_encrypt_wallet('test')
self.bitcoind_processes[0].wait()
# Restart node 0 # Restart node 0
nodes[0] = self.start_node(0, self.options.tmpdir, ['-usehd=1'], stderr=sys.stdout) nodes[0] = self.start_node(0, self.options.tmpdir, ['-usehd=1'], stderr=sys.stdout)
# Keep creating keys # Keep creating keys