From 50b044a88e3cfa67e28261333e658f4288d54018 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Thu, 9 Dec 2021 16:18:44 +0100 Subject: [PATCH 1/2] test: fix test feature_coinstatsindex.py for descriptor wallets --- test/functional/feature_coinstatsindex.py | 4 +++- test/functional/interface_bitcoin_cli.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/functional/feature_coinstatsindex.py b/test/functional/feature_coinstatsindex.py index 8afd0ff74a4..c70f8a83db1 100755 --- a/test/functional/feature_coinstatsindex.py +++ b/test/functional/feature_coinstatsindex.py @@ -40,7 +40,9 @@ class CoinStatsIndexTest(BitcoinTestFramework): self.num_nodes = 2 self.supports_cli = False self.extra_args = [ - [], + # Explicitly set the output type in order to have consistent tx vsize / fees + # for both legacy and descriptor wallets (disables the change address type detection algorithm) + ["-addresstype=bech32", "-changetype=bech32"], ["-coinstatsindex"] ] diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py index 2ea9ebfc987..db5564ac50a 100755 --- a/test/functional/interface_bitcoin_cli.py +++ b/test/functional/interface_bitcoin_cli.py @@ -140,7 +140,7 @@ class TestBitcoinCli(BitcoinTestFramework): if self.is_specified_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 + # Explicitly set the output type in order to have consistent 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) From 61fb410c0d9bc9e5fe4e3c52b4c519d49faf15f6 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Thu, 9 Dec 2021 16:20:51 +0100 Subject: [PATCH 2/2] test: add feature_coinstatsindex.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 0a764a17556..675f9aa8ffc 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -304,7 +304,8 @@ BASE_SCRIPTS = [ 'feature_txindex_compatibility.py', 'feature_logging.py', 'feature_anchors.py', - 'feature_coinstatsindex.py', + 'feature_coinstatsindex.py --legacy-wallet', + 'feature_coinstatsindex.py --descriptors', 'wallet_orphanedreward.py', 'p2p_node_network_limited.py', 'p2p_permissions.py',