Skip to content

Commit b5f33ac

Browse files
sipasipa
committed
Simplify wallet_taproot.py functional test
1 parent eb0667e commit b5f33ac

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

‎test/functional/test_framework/script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from .ripemd160 import ripemd160
2828

2929
MAX_SCRIPT_ELEMENT_SIZE = 520
30-
MAX_PUBKEYS_PER_MULTI_A = 512
30+
MAX_PUBKEYS_PER_MULTI_A = 999
3131
LOCKTIME_THRESHOLD = 500000000
3232
ANNEX_TAG = 0x50
3333

‎test/functional/wallet_taproot.py

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ def do_test_psbt(self, comment, pattern, privmap, treefn, keys_pay, keys_change)
330330
self.generatetoaddress(self.nodes[0], 1, self.boring.getnewaddress(), sync_fun=self.no_op)
331331
assert(self.psbt_online.gettransaction(txid)['confirmations'] > 0)
332332

333-
def do_test(self, comment, pattern, privmap, treefn, nkeys):
333+
def do_test(self, comment, pattern, privmap, treefn):
334+
nkeys = len(privmap)
334335
keys = self.rand_keys(nkeys * 4)
335336
self.do_test_addr(comment, pattern, privmap, treefn, keys[0:nkeys])
336337
self.do_test_sendtoaddress(comment, pattern, privmap, treefn, keys[0:nkeys], keys[nkeys:2*nkeys])
@@ -365,114 +366,98 @@ def run_test(self):
365366
"tr(XPRV)",
366367
"tr($1/*)",
367368
[True],
368-
lambda k1: (key(k1), []),
369-
1
369+
lambda k1: (key(k1), [])
370370
)
371371
self.do_test(
372372
"tr(H,XPRV)",
373373
"tr($H,pk($1/*))",
374374
[True],
375-
lambda k1: (key(H_POINT), [pk(k1)]),
376-
1
375+
lambda k1: (key(H_POINT), [pk(k1)])
377376
)
378377
self.do_test(
379378
"wpkh(XPRV)",
380379
"wpkh($1/*)",
381380
[True],
382-
None,
383-
1
381+
None
384382
)
385383
self.do_test(
386384
"tr(XPRV,{H,{H,XPUB}})",
387385
"tr($1/*,{pk($H),{pk($H),pk($2/*)}})",
388386
[True, False],
389-
lambda k1, k2: (key(k1), [pk(H_POINT), [pk(H_POINT), pk(k2)]]),
390-
2
387+
lambda k1, k2: (key(k1), [pk(H_POINT), [pk(H_POINT), pk(k2)]])
391388
)
392389
self.do_test(
393390
"wsh(multi(1,XPRV,XPUB))",
394391
"wsh(multi(1,$1/*,$2/*))",
395392
[True, False],
396-
None,
397-
2
393+
None
398394
)
399395
self.do_test(
400396
"tr(XPRV,{XPUB,XPUB})",
401397
"tr($1/*,{pk($2/*),pk($2/*)})",
402398
[True, False],
403-
lambda k1, k2: (key(k1), [pk(k2), pk(k2)]),
404-
2
399+
lambda k1, k2: (key(k1), [pk(k2), pk(k2)])
405400
)
406401
self.do_test(
407402
"tr(XPRV,{{XPUB,H},{H,XPUB}})",
408403
"tr($1/*,{{pk($2/*),pk($H)},{pk($H),pk($2/*)}})",
409404
[True, False],
410-
lambda k1, k2: (key(k1), [[pk(k2), pk(H_POINT)], [pk(H_POINT), pk(k2)]]),
411-
2
405+
lambda k1, k2: (key(k1), [[pk(k2), pk(H_POINT)], [pk(H_POINT), pk(k2)]])
412406
)
413407
self.do_test(
414408
"tr(XPUB,{{H,{H,XPUB}},{H,{H,{H,XPRV}}}})",
415409
"tr($1/*,{{pk($H),{pk($H),pk($2/*)}},{pk($H),{pk($H),{pk($H),pk($3/*)}}}})",
416410
[False, False, True],
417-
lambda k1, k2, k3: (key(k1), [[pk(H_POINT), [pk(H_POINT), pk(k2)]], [pk(H_POINT), [pk(H_POINT), [pk(H_POINT), pk(k3)]]]]),
418-
3
411+
lambda k1, k2, k3: (key(k1), [[pk(H_POINT), [pk(H_POINT), pk(k2)]], [pk(H_POINT), [pk(H_POINT), [pk(H_POINT), pk(k3)]]]])
419412
)
420413
self.do_test(
421414
"tr(XPRV,{XPUB,{{XPUB,{H,H}},{{H,H},XPUB}}})",
422415
"tr($1/*,{pk($2/*),{{pk($2/*),{pk($H),pk($H)}},{{pk($H),pk($H)},pk($2/*)}}})",
423416
[True, False],
424-
lambda k1, k2: (key(k1), [pk(k2), [[pk(k2), [pk(H_POINT), pk(H_POINT)]], [[pk(H_POINT), pk(H_POINT)], pk(k2)]]]),
425-
2
417+
lambda k1, k2: (key(k1), [pk(k2), [[pk(k2), [pk(H_POINT), pk(H_POINT)]], [[pk(H_POINT), pk(H_POINT)], pk(k2)]]])
426418
)
427419
self.do_test(
428420
"tr(H,multi_a(1,XPRV))",
429421
"tr($H,multi_a(1,$1/*))",
430422
[True],
431-
lambda k1: (key(H_POINT), [multi_a(1, [k1])]),
432-
1
423+
lambda k1: (key(H_POINT), [multi_a(1, [k1])])
433424
)
434425
self.do_test(
435426
"tr(H,sortedmulti_a(1,XPRV,XPUB))",
436427
"tr($H,sortedmulti_a(1,$1/*,$2/*))",
437428
[True, False],
438-
lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2], True)]),
439-
2
429+
lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2], True)])
440430
)
441431
self.do_test(
442432
"tr(H,multi_a(1,XPUB,XPRV))",
443433
"tr($H,multi_a(1,$1/*,$2/*))",
444434
[False, True],
445-
lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2])]),
446-
2
435+
lambda k1, k2: (key(H_POINT), [multi_a(1, [k1, k2])])
447436
)
448437
self.do_test(
449438
"tr(H,sortedmulti_a(1,XPUB,XPRV,XPRV))",
450439
"tr($H,sortedmulti_a(1,$1/*,$2/*,$3/*))",
451440
[False, True, True],
452-
lambda k1, k2, k3: (key(H_POINT), [multi_a(1, [k1, k2, k3], True)]),
453-
3
441+
lambda k1, k2, k3: (key(H_POINT), [multi_a(1, [k1, k2, k3], True)])
454442
)
455443
self.do_test(
456444
"tr(H,multi_a(2,XPRV,XPUB,XPRV))",
457445
"tr($H,multi_a(2,$1/*,$2/*,$3/*))",
458446
[True, False, True],
459-
lambda k1, k2, k3: (key(H_POINT), [multi_a(2, [k1, k2, k3])]),
460-
3
447+
lambda k1, k2, k3: (key(H_POINT), [multi_a(2, [k1, k2, k3])])
461448
)
462449
self.do_test(
463450
"tr(XPUB,{{XPUB,{XPUB,sortedmulti_a(2,XPRV,XPUB,XPRV)}})",
464451
"tr($2/*,{pk($2/*),{pk($2/*),sortedmulti_a(2,$1/*,$2/*,$3/*)}})",
465452
[True, False, True],
466-
lambda k1, k2, k3: (key(k2), [pk(k2), [pk(k2), multi_a(2, [k1, k2, k3], True)]]),
467-
3
453+
lambda k1, k2, k3: (key(k2), [pk(k2), [pk(k2), multi_a(2, [k1, k2, k3], True)]])
468454
)
469455
rnd_pos = random.randrange(MAX_PUBKEYS_PER_MULTI_A)
470456
self.do_test(
471457
"tr(XPUB,multi_a(1,H...,XPRV,H...))",
472458
"tr($2/*,multi_a(1" + (",$H" * rnd_pos) + ",$1/*" + (",$H" * (MAX_PUBKEYS_PER_MULTI_A - 1 - rnd_pos)) + "))",
473459
[True, False],
474-
lambda k1, k2: (key(k2), [multi_a(1, ([H_POINT] * rnd_pos) + [k1] + ([H_POINT] * (MAX_PUBKEYS_PER_MULTI_A - 1 - rnd_pos)))]),
475-
2
460+
lambda k1, k2: (key(k2), [multi_a(1, ([H_POINT] * rnd_pos) + [k1] + ([H_POINT] * (MAX_PUBKEYS_PER_MULTI_A - 1 - rnd_pos)))])
476461
)
477462

478463
self.log.info("Sending everything back...")

0 commit comments

Comments
 (0)