GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge aa83bbb1fe into merged_master (Bitcoin PR bitcoin/bitcoin#24490)

Browse source
This commit is contained in:
Byron Hambly 2023-10-13 13:56:53 +00:00
commit ea4ad0dddc
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/functional/wallet_taproot.py
View file

@ -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))",