highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-24 07:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use importdescriptors for descriptor wallets in wallet_bumpfee.py

Browse Source 
If using descriptor wallets, use importdescriptors instead of
importmulti.
This commit is contained in:
Andrew Chow 2020-04-06 16:10:15 -04:00
parent c2711e4230
commit 4b871909d6
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/functional/wallet_bumpfee.py
View File

@ -184,7 +184,7 @@ def test_segwit_bumpfee_succeeds(self, rbf_node, dest_address):
# which spends it, and make sure bumpfee can be called on it. # which spends it, and make sure bumpfee can be called on it.
segwit_in = next(u for u in rbf_node.listunspent() if u["amount"] == Decimal("0.001")) segwit_in = next(u for u in rbf_node.listunspent() if u["amount"] == Decimal("0.001"))
segwit_out = rbf_node.getaddressinfo(rbf_node.getnewaddress(address_type='p2sh-segwit')) segwit_out = rbf_node.getaddressinfo(rbf_node.getnewaddress(address_type='bech32'))
segwitid = send_to_witness( segwitid = send_to_witness(
use_p2wsh=False, use_p2wsh=False,
node=rbf_node, node=rbf_node,
@ -365,7 +365,7 @@ def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
rbf_node.createwallet(wallet_name="signer", disable_private_keys=False, blank=True) rbf_node.createwallet(wallet_name="signer", disable_private_keys=False, blank=True)
signer = rbf_node.get_wallet_rpc("signer") signer = rbf_node.get_wallet_rpc("signer")
assert signer.getwalletinfo()['private_keys_enabled'] assert signer.getwalletinfo()['private_keys_enabled']
result = signer.importmulti([{ reqs = [{
"desc": priv_rec_desc, "desc": priv_rec_desc,
"timestamp": 0, "timestamp": 0,
"range": [0,1], "range": [0,1],
@ -378,7 +378,11 @@ def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
"range": [0, 0], "range": [0, 0],
"internal": True, "internal": True,
"keypool": False "keypool": False
}]) }]
if self.options.descriptors:
result = signer.importdescriptors(reqs)
else:
result = signer.importmulti(reqs)
assert_equal(result, [{'success': True}, {'success': True}]) assert_equal(result, [{'success': True}, {'success': True}])
# Create another wallet with just the public keys, which creates PSBTs # Create another wallet with just the public keys, which creates PSBTs
@ -386,21 +390,27 @@ def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
watcher = rbf_node.get_wallet_rpc("watcher") watcher = rbf_node.get_wallet_rpc("watcher")
assert not watcher.getwalletinfo()['private_keys_enabled'] assert not watcher.getwalletinfo()['private_keys_enabled']
result = watcher.importmulti([{ reqs = [{
"desc": pub_rec_desc, "desc": pub_rec_desc,
"timestamp": 0, "timestamp": 0,
"range": [0, 10], "range": [0, 10],
"internal": False, "internal": False,
"keypool": True, "keypool": True,
"watchonly": True "watchonly": True,
"active": True,
}, { }, {
"desc": pub_change_desc, "desc": pub_change_desc,
"timestamp": 0, "timestamp": 0,
"range": [0, 10], "range": [0, 10],
"internal": True, "internal": True,
"keypool": True, "keypool": True,
"watchonly": True "watchonly": True,
}]) "active": True,
}]
if self.options.descriptors:
result = watcher.importdescriptors(reqs)
else:
result = watcher.importmulti(reqs)
assert_equal(result, [{'success': True}, {'success': True}]) assert_equal(result, [{'success': True}, {'success': True}])
funding_address1 = watcher.getnewaddress(address_type='bech32') funding_address1 = watcher.getnewaddress(address_type='bech32')