From 3fd7e76f6d4b4eae0b36d9b33376274f5387a6f3 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 16 Oct 2018 11:21:07 -0400 Subject: [tests] Move deterministic address import to setup_nodes This requires a small changes to a few tests, but means that deterministic addresses will always be imported (unless setup_nodes behaviour is explicitly overridden). --- test/functional/wallet_import_rescan.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'test/functional/wallet_import_rescan.py') diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index f043a544fc..08809a688a 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -122,16 +122,14 @@ class ImportRescanTest(BitcoinTestFramework): # Import keys with pruning disabled self.start_nodes(extra_args=[[]] * self.num_nodes) - super().import_deterministic_coinbase_privkeys() + for n in self.nodes: + n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase') self.stop_nodes() self.start_nodes() for i in range(1, self.num_nodes): connect_nodes(self.nodes[i], 0) - def import_deterministic_coinbase_privkeys(self): - pass - def run_test(self): # Create one transaction on node 0 with a unique amount for # each possible type of wallet import RPC. -- cgit v1.2.3