Skip to content

Commit 3635d43

Browse files
committed
test: rpc_createmultisig, remove manual wallet initialization
There is no need to manually initialize the wallets within the test case. The test framework already initializes them when `_requires_wallet` is true.
1 parent f5b6f62 commit 3635d43

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

test/functional/rpc_createmultisig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def set_test_params(self):
3232
self.setup_clean_chain = True
3333
self.num_nodes = 3
3434
self.supports_cli = False
35+
self.enable_wallet_if_possible()
3536

3637
def get_keys(self):
3738
self.pub = []
@@ -51,7 +52,6 @@ def run_test(self):
5152
self.wallet = MiniWallet(test_node=node0)
5253

5354
if self.is_bdb_compiled():
54-
self.import_deterministic_coinbase_privkeys()
5555
self.check_addmultisigaddress_errors()
5656

5757
self.log.info('Generating blocks ...')

test/functional/test_framework/test_framework.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,10 @@ def init_wallet(self, *, node):
444444
n.createwallet(wallet_name=wallet_name, descriptors=self.options.descriptors, load_on_startup=True)
445445
n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase', rescan=True)
446446

447+
# Only enables wallet support when the module is available
448+
def enable_wallet_if_possible(self):
449+
self._requires_wallet = self.is_wallet_compiled()
450+
447451
def run_test(self):
448452
"""Tests must override this method to define test logic"""
449453
raise NotImplementedError

0 commit comments

Comments
 (0)