fix: missing changes from bitcoin#20034 test: Get rid of default wallet hacks

This commit is contained in:
Konstantin Akimov 2023-06-12 18:40:20 +07:00 committed by PastaPastaPasta
parent f093c9478c
commit 08a37a3c8c
3 changed files with 5 additions and 0 deletions

View File

@ -40,6 +40,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework):
["-nowallet"], # v0.17.0.3 ["-nowallet"], # v0.17.0.3
["-nowallet"], # v0.16.1.1 ["-nowallet"], # v0.16.1.1
] ]
self.wallet_names = [self.default_wallet_name]
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):
self.skip_if_no_wallet() self.skip_if_no_wallet()
@ -56,6 +57,7 @@ class BackwardsCompatibilityTest(BitcoinTestFramework):
]) ])
self.start_nodes() self.start_nodes()
self.import_deterministic_coinbase_privkeys()
def run_test(self): def run_test(self):
self.nodes[0].generatetoaddress(101, self.nodes[0].getnewaddress()) self.nodes[0].generatetoaddress(101, self.nodes[0].getnewaddress())

View File

@ -20,6 +20,7 @@ from test_framework.util import (
class MempoolCompatibilityTest(BitcoinTestFramework): class MempoolCompatibilityTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.num_nodes = 2 self.num_nodes = 2
self.wallet_names = [None, self.default_wallet_name]
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):
self.skip_if_no_wallet() self.skip_if_no_wallet()

View File

@ -30,6 +30,7 @@ class UpgradeWalletTest(BitcoinTestFramework):
["-usehd=1"], # v0.16.3 wallet ["-usehd=1"], # v0.16.3 wallet
["-usehd=0"] # v0.15.2 wallet ["-usehd=0"] # v0.15.2 wallet
] ]
self.wallet_names = [self.default_wallet_name]
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):
self.skip_if_no_wallet() self.skip_if_no_wallet()
@ -49,6 +50,7 @@ class UpgradeWalletTest(BitcoinTestFramework):
adjust_bitcoin_conf_for_pre_17(self.nodes[1].bitcoinconf) adjust_bitcoin_conf_for_pre_17(self.nodes[1].bitcoinconf)
adjust_bitcoin_conf_for_pre_17(self.nodes[2].bitcoinconf) adjust_bitcoin_conf_for_pre_17(self.nodes[2].bitcoinconf)
self.start_nodes() self.start_nodes()
self.import_deterministic_coinbase_privkeys()
def dumb_sync_blocks(self): def dumb_sync_blocks(self):
""" """