From e4fa28a3228619b58d0177a28dc016aac8a87afe Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Mon, 6 Dec 2021 19:57:45 +0100 Subject: [PATCH 1/2] test: fix test interface_bitcoin_cli.py for descriptor wallets --- test/functional/interface_bitcoin_cli.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py index 6076dceeafd..8a1edb7eb20 100755 --- a/test/functional/interface_bitcoin_cli.py +++ b/test/functional/interface_bitcoin_cli.py @@ -140,6 +140,9 @@ class TestBitcoinCli(BitcoinTestFramework): if self.is_wallet_compiled(): self.log.info("Test -getinfo and bitcoin-cli getwalletinfo return expected wallet info") + # Explicitely set the output type in order to have constintent tx vsize / fees + # for both legacy and descriptor wallets (disables the change address type detection algorithm) + self.restart_node(0, extra_args=["-addresstype=bech32", "-changetype=bech32"]) assert_equal(Decimal(cli_get_info['Balance']), BALANCE) assert 'Balances' not in cli_get_info_string wallet_info = self.nodes[0].getwalletinfo() From 035767f54a393ff9c0b4869b3142db12ecacb8e3 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Mon, 6 Dec 2021 20:00:37 +0100 Subject: [PATCH 2/2] test: add interface_bitcoin_cli.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 24740e30115..ac1eed63abd 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -138,7 +138,8 @@ BASE_SCRIPTS = [ 'feature_fee_estimation.py', 'interface_zmq.py', 'rpc_invalid_address_message.py', - 'interface_bitcoin_cli.py', + 'interface_bitcoin_cli.py --legacy-wallet', + 'interface_bitcoin_cli.py --descriptors', 'feature_bind_extra.py', 'mempool_resurrect.py', 'wallet_txn_doublespend.py --mineblock',