mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
Merge bitcoin/bitcoin#23725: test: fix feature_coinstatsindex.py --descriptors
and add to test runner
61fb410c0d
test: add feature_coinstatsindex.py --descriptors to test_runner.py (Sebastian Falbesoner)50b044a88e
test: fix test feature_coinstatsindex.py for descriptor wallets (Sebastian Falbesoner) Pull request description: The functional test feature_coinstatsindex.py currently fails on master branch, if descriptor wallets are used (argument `--descriptors`; or if BDB is not compiled, see https://github.com/bitcoin/bitcoin/pull/23682#issuecomment-989827592). This is due to the fact that different change output types are used for created transactions (P2WPKH for legacy wallets, P2TR for descriptor wallets; the former doesn't have a ScriptPubKeyMan for bech32m), resulting in different tx sizes and hence also fees. Fix this by explicitely setting the output type via passing both `-addresstype=bech32` and `-changetype=bech32` as argument. The former would not be needed by now, but makes the test more deterministic and avoids a failure if bech32m becomes the default address type. Should further pave the way for #23682. ACKs for top commit: MarcoFalke: cr ACK61fb410c0d
Tree-SHA512: 300a53f539c0b874da5fc1dd1e4e41b9408dc5526c5858c79f0aabf2ab07e57df4c9cc627fafe25246206752754a91a2977a3df8f8b2d98fb98e51c7e4d81633
This commit is contained in:
commit
2f26d8ec70
3 changed files with 6 additions and 3 deletions
|
@ -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"]
|
||||
]
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Add table
Reference in a new issue