From 166f8ec28e48aa4c0cd94544909c488df553d8ef Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Fri, 26 Nov 2021 17:10:55 +0100 Subject: [PATCH 1/2] test: always rescan after importing private keys in `init_wallet` helper This fixes the functional test feature_rbf.py for descriptor wallets. --- test/functional/test_framework/test_framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index a781da27208..6746fbf9f92 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -431,7 +431,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): n = self.nodes[node] if wallet_name is not None: n.createwallet(wallet_name=wallet_name, descriptors=self.options.descriptors, load_on_startup=True) - n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase') + n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase', rescan=True) def run_test(self): """Tests must override this method to define test logic""" From b79dbe86a9886b3539512f6c35205f4c5454a952 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Fri, 26 Nov 2021 17:16:08 +0100 Subject: [PATCH 2/2] test: add feature_rbf.py --descriptors to test_runner.py --- test/functional/test_runner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index ab5740d1aa5..b9b4edf0ba3 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -217,7 +217,8 @@ BASE_SCRIPTS = [ 'rpc_getblockfilter.py', 'rpc_invalidateblock.py', 'feature_utxo_set_hash.py', - 'feature_rbf.py', + 'feature_rbf.py --legacy-wallet', + 'feature_rbf.py --descriptors', 'mempool_packages.py', 'mempool_package_onemore.py', 'rpc_createmultisig.py --legacy-wallet',