diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-11-15 10:56:16 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-11-16 08:20:33 +0100 |
commit | fa3e0da06b491b8c0fa2dbae37682a9112c9deb8 (patch) | |
tree | 3b4433c45304ee8e430858cef37655a91b729c97 /test/functional/wallet_taproot.py | |
parent | 15d109802ab93b0af9647858c9d8adcd8a2db84a (diff) | |
download | bitcoin-fa3e0da06b491b8c0fa2dbae37682a9112c9deb8.tar.xz |
policy: Treat taproot as always active
Diffstat (limited to 'test/functional/wallet_taproot.py')
-rwxr-xr-x | test/functional/wallet_taproot.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/functional/wallet_taproot.py b/test/functional/wallet_taproot.py index b22c171374..d286b91491 100755 --- a/test/functional/wallet_taproot.py +++ b/test/functional/wallet_taproot.py @@ -237,20 +237,15 @@ class WalletTaprootTest(BitcoinTestFramework): assert_equal(len(rederive), 1) assert_equal(rederive[0], addr_g) - # tr descriptors cannot be imported when Taproot is not active + # tr descriptors can be imported regardless of Taproot status result = self.privs_tr_enabled.importdescriptors([{"desc": desc, "timestamp": "now"}]) assert(result[0]["success"]) result = self.pubs_tr_enabled.importdescriptors([{"desc": desc_pub, "timestamp": "now"}]) assert(result[0]["success"]) - if desc.startswith("tr"): - result = self.privs_tr_disabled.importdescriptors([{"desc": desc, "timestamp": "now"}]) - assert(not result[0]["success"]) - assert_equal(result[0]["error"]["code"], -4) - assert_equal(result[0]["error"]["message"], "Cannot import tr() descriptor when Taproot is not active") - result = self.pubs_tr_disabled.importdescriptors([{"desc": desc_pub, "timestamp": "now"}]) - assert(not result[0]["success"]) - assert_equal(result[0]["error"]["code"], -4) - assert_equal(result[0]["error"]["message"], "Cannot import tr() descriptor when Taproot is not active") + result = self.privs_tr_disabled.importdescriptors([{"desc": desc, "timestamp": "now"}]) + assert result[0]["success"] + result = self.pubs_tr_disabled.importdescriptors([{"desc": desc_pub, "timestamp": "now"}]) + assert result[0]["success"] def do_test_sendtoaddress(self, comment, pattern, privmap, treefn, keys_pay, keys_change): self.log.info("Testing %s through sendtoaddress" % comment) |