diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-09 11:33:00 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-09 11:33:03 +0100 |
| commit | aa83bbb1fe4807e3cd018ca3185f14ae2fd5120f (patch) | |
| tree | f5645650eea28d1ab296d8ef0872749bffa3f6a5 | |
| parent | fe5fdbd687db610aa004f0a7299fe326a5a2794a (diff) | |
| parent | db27ac935480aeec40a1cfc9d5f10a48be55d61b (diff) | |
| download | bitcoin-aa83bbb1fe4807e3cd018ca3185f14ae2fd5120f.tar.xz | |
Merge bitcoin/bitcoin#24490: tests: Ensure sorted/multi_a descriptors always generate different addrs
db27ac935480aeec40a1cfc9d5f10a48be55d61b tests: Ensure sorted/multi_a descriptors always generate different addrs (Andrew Chow)
Pull request description:
Sometimes the multi_a and sortedmulti_a descriptors will produce some of the same addresses in the tests. This causes the wallets to start generating addresses at a different index as they detect that one of the addresses is used. This subsequently causes a test failure.
To avoid this problem, use descriptors that will produce unique addresses by putting one of the multi_a in a different branch.
ACKs for top commit:
ajtowns:
ACK db27ac935480aeec40a1cfc9d5f10a48be55d61b
theStack:
Tested ACK db27ac935480aeec40a1cfc9d5f10a48be55d61b
Tree-SHA512: 0f57822bf4c7c79da304f092d7d43d6118e78a087cbeb0766fbbf634dc27911ae723d5d41350884d3b63a24d3b3817944f7e5fa534afb849161dd008a1e4a62f
| -rwxr-xr-x | test/functional/wallet_taproot.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/wallet_taproot.py b/test/functional/wallet_taproot.py index 24758830a3..d3731b135a 100755 --- a/test/functional/wallet_taproot.py +++ b/test/functional/wallet_taproot.py @@ -416,10 +416,10 @@ class WalletTaprootTest(BitcoinTestFramework): lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2], True)]) ) self.do_test( - "tr(H,multi_a(1,XPUB,XPRV))", - "tr($H,multi_a(1,$1/*,$2/*))", + "tr(H,{H,multi_a(1,XPUB,XPRV)})", + "tr($H,{pk($H),multi_a(1,$1/*,$2/*)})", [False, True], - lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2])]) + lambda k1, k2: (key(H_POINT), [pk(H_POINT), [multi_a(1, [k1, k2])]]) ) self.do_test( "tr(H,sortedmulti_a(1,XPUB,XPRV,XPRV))", |