diff options
author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2021-06-28 20:45:04 +0200 |
---|---|---|
committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2021-07-05 20:40:52 +0200 |
commit | 905d672b743edf31531d095ffe800449eaffec69 (patch) | |
tree | e027a699270a2c863d944573fa30265060516ba4 /test/functional/feature_taproot.py | |
parent | 285a65ccfde2e811cfe01e916b998c02ee534a97 (diff) | |
download | bitcoin-905d672b743edf31531d095ffe800449eaffec69.tar.xz |
test: use script_util helpers for creating P2W{PKH,SH} scripts
Diffstat (limited to 'test/functional/feature_taproot.py')
-rwxr-xr-x | test/functional/feature_taproot.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py index fefa369ffe..17be29c7bf 100755 --- a/test/functional/feature_taproot.py +++ b/test/functional/feature_taproot.py @@ -76,15 +76,16 @@ from test_framework.script import ( taproot_construct, ) from test_framework.script_util import ( + key_to_p2wpkh_script, keyhash_to_p2pkh_script, script_to_p2sh_script, + script_to_p2wsh_script, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_raises_rpc_error, assert_equal from test_framework.key import generate_privkey, compute_xonly_pubkey, sign_schnorr, tweak_add_privkey, ECKey from test_framework.address import ( hash160, - sha256, ) from collections import OrderedDict, namedtuple from io import BytesIO @@ -461,13 +462,13 @@ def make_spender(comment, *, tap=None, witv0=False, script=None, pkh=None, p2sh= # P2WPKH assert script is None pubkeyhash = hash160(pkh) - spk = CScript([OP_0, pubkeyhash]) + spk = key_to_p2wpkh_script(pkh) conf["scriptcode"] = keyhash_to_p2pkh_script(pubkeyhash) conf["script_witv0"] = None conf["inputs"] = [getter("sign"), pkh] elif script is not None: # P2WSH - spk = CScript([OP_0, sha256(script)]) + spk = script_to_p2wsh_script(script) conf["scriptcode"] = script conf["script_witv0"] = script else: |