qa: Remove unneded import_deterministic_coinbase_privkeys overwrite, add comments
This commit is contained in:
parent
e413c2ddd1
commit
fa8433e379
3 changed files with 11 additions and 12 deletions
|
@ -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()
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue