Skip to content

Commit f7a1e67

Browse files
committed
Merge bitcoin/bitcoin#25159: test: use sendall in wallet_taproot.py tests
c6122f5 test: use sendall in wallet_taproot.py tests (ishaanam) Pull request description: Fixes #25129 (subtractfeefromamount=true fails with insufficient funds) ACKs for top commit: achow101: ACK c6122f5 Xekyo: tACK c6122f5 brunoerg: ACK c6122f5 Tree-SHA512: c73512852ced6216eab80f4079d6e3d5ba949fbc6bfea5f4034c7fa200b0048e97a1451274a142deb4f698de0702a8940957be8a00ebd2c19cf50604b21016d4
2 parents d5d40d5 + c6122f5 commit f7a1e67

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/functional/wallet_taproot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,11 @@ def run_test(self):
441441

442442
self.log.info("Sending everything back...")
443443

444-
txid = self.rpc_online.sendtoaddress(address=self.boring.getnewaddress(), amount=self.rpc_online.getbalance(), subtractfeefromamount=True)
444+
txid = self.rpc_online.sendall(recipients=[self.boring.getnewaddress()])["txid"]
445445
self.generatetoaddress(self.nodes[0], 1, self.boring.getnewaddress(), sync_fun=self.no_op)
446446
assert(self.rpc_online.gettransaction(txid)["confirmations"] > 0)
447447

448-
psbt = self.psbt_online.walletcreatefundedpsbt([], [{self.boring.getnewaddress(): self.psbt_online.getbalance()}], None, {"subtractFeeFromOutputs": [0]})['psbt']
448+
psbt = self.psbt_online.sendall(recipients=[self.boring.getnewaddress()], options={"psbt": True})["psbt"]
449449
res = self.psbt_offline.walletprocesspsbt(psbt)
450450
assert(res['complete'])
451451
rawtx = self.nodes[0].finalizepsbt(res['psbt'])['hex']

0 commit comments

Comments
 (0)