mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-15 16:53:19 +02:00
Merge bitcoin/bitcoin#23963: test: run feature_pruning.py without wallet compiled
0754e9c01b
test: run feature_pruning.py without wallet compiled (Sebastian Falbesoner) Pull request description: Only one small part of the pruning test (sub-test `wallet_test`) is wallet-related, hence we can run all other parts without wallet compiled. ACKs for top commit: MarcoFalke: cr ACK0754e9c01b
Tree-SHA512: 856856903d21d64953ed0102cc2a96f55975c4b7d8e93e57b82c266024967160df64df2b6068be089efc05e883e8d6d12e7327053420d4c640b9d8cc5bcb1c58
This commit is contained in:
@ -96,9 +96,6 @@ class PruneTest(BitcoinTestFramework):
|
|||||||
]
|
]
|
||||||
self.rpc_timeout = 120
|
self.rpc_timeout = 120
|
||||||
|
|
||||||
def skip_test_if_missing_module(self):
|
|
||||||
self.skip_if_no_wallet()
|
|
||||||
|
|
||||||
def setup_network(self):
|
def setup_network(self):
|
||||||
self.setup_nodes()
|
self.setup_nodes()
|
||||||
|
|
||||||
@ -114,6 +111,7 @@ class PruneTest(BitcoinTestFramework):
|
|||||||
def setup_nodes(self):
|
def setup_nodes(self):
|
||||||
self.add_nodes(self.num_nodes, self.extra_args)
|
self.add_nodes(self.num_nodes, self.extra_args)
|
||||||
self.start_nodes()
|
self.start_nodes()
|
||||||
|
if self.is_wallet_compiled():
|
||||||
self.import_deterministic_coinbase_privkeys()
|
self.import_deterministic_coinbase_privkeys()
|
||||||
|
|
||||||
def create_big_chain(self):
|
def create_big_chain(self):
|
||||||
@ -474,6 +472,7 @@ class PruneTest(BitcoinTestFramework):
|
|||||||
self.log.info("Test manual pruning with timestamps")
|
self.log.info("Test manual pruning with timestamps")
|
||||||
self.manual_test(4, use_timestamp=True)
|
self.manual_test(4, use_timestamp=True)
|
||||||
|
|
||||||
|
if self.is_wallet_compiled():
|
||||||
self.log.info("Test wallet re-scan")
|
self.log.info("Test wallet re-scan")
|
||||||
self.wallet_test()
|
self.wallet_test()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user