diff options
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/interface_zmq.py | 15 | ||||
| -rwxr-xr-x | test/functional/wallet_dump.py | 6 | ||||
| -rwxr-xr-x | test/functional/wallet_import_rescan.py | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index c853ba7e3f..1c518eab75 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -44,12 +44,6 @@ class ZMQTest (BitcoinTestFramework): self.skip_if_no_wallet() def setup_nodes(self): - # Import keys - self.add_nodes(self.num_nodes) - self.start_nodes() - super().import_deterministic_coinbase_privkeys() - self.stop_nodes() - import zmq # Initialize ZMQ context and socket. @@ -69,12 +63,13 @@ class ZMQTest (BitcoinTestFramework): self.rawblock = ZMQSubscriber(socket, b"rawblock") self.rawtx = ZMQSubscriber(socket, b"rawtx") - self.nodes[0].extra_args = ["-zmqpub%s=%s" % (sub.topic.decode(), address) for sub in [self.hashblock, self.hashtx, self.rawblock, self.rawtx]] + self.extra_args = [ + ["-zmqpub%s=%s" % (sub.topic.decode(), address) for sub in [self.hashblock, self.hashtx, self.rawblock, self.rawtx]], + [], + ] + self.add_nodes(self.num_nodes, self.extra_args) self.start_nodes() - def import_deterministic_coinbase_privkeys(self): - pass - def run_test(self): try: self._zmq_test() diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py index db731b2a34..125e114b2c 100755 --- a/test/functional/wallet_dump.py +++ b/test/functional/wallet_dump.py @@ -34,7 +34,11 @@ def read_dump(file_name, addrs, script_addrs, hd_master_addr_old): # key = key_date_label[0] date = key_date_label[1] keytype = key_date_label[2] - if not len(comment) or date.startswith('1970'): + + imported_key = date == '1970-01-01T00:00:01Z' + if imported_key: + # Imported keys have multiple addresses, no label (keypath) and timestamp + # Skip them continue addr_keypath = comment.split(" addr=")[1] diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index aa4e37ed60..aee2fdd37b 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -120,7 +120,7 @@ class ImportRescanTest(BitcoinTestFramework): self.add_nodes(self.num_nodes, extra_args=extra_args) - # Import keys + # Import keys with pruning disabled self.start_nodes(extra_args=[[]] * self.num_nodes) super().import_deterministic_coinbase_privkeys() self.stop_nodes() |