Create a tr() descriptor bech32m DescriptorScriptPubKeyMan by default
This commit is contained in:
1 parent
54b3699862
commit
8fb57845ee
13 files changed
+80
-54
No files matched your search
@@ -70,8 +70,8 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||
|
||||
def get_expected_info_output(self, name="", transactions=0, keypool=2, address=0):
|
||||
wallet_name = self.default_wallet_name if name == "" else name
|
||||
output_types = 3 # p2pkh, p2sh, segwit
|
||||
if self.options.descriptors:
|
||||
output_types = 4 # p2pkh, p2sh, segwit, bech32m
|
||||
return textwrap.dedent('''\
|
||||
Wallet info
|
||||
===========
|
||||
@@ -85,6 +85,7 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||
Address Book: %d
|
||||
''' % (wallet_name, keypool * output_types, transactions, address))
|
||||
else:
|
||||
output_types = 3 # p2pkh, p2sh, segwit. Legacy wallets do not support bech32m.
|
||||
return textwrap.dedent('''\
|
||||
Wallet info
|
||||
===========
|
||||
@@ -298,8 +299,8 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||
assert_equal(1000, out['keypoolsize_hd_internal'])
|
||||
assert_equal(True, 'hdseedid' in out)
|
||||
else:
|
||||
assert_equal(3000, out['keypoolsize'])
|
||||
assert_equal(3000, out['keypoolsize_hd_internal'])
|
||||
assert_equal(4000, out['keypoolsize'])
|
||||
assert_equal(4000, out['keypoolsize_hd_internal'])
|
||||
|
||||
self.log_wallet_timestamp_comparison(timestamp_before, timestamp_after)
|
||||
assert_equal(timestamp_before, timestamp_after)
|
||||
|
||||
Reference in new issue
Block a user