Skip to content

Commit 3f1e10b

Browse files
committed
Update feeRate (BTC/kvB) to fee_rate (sat/vB) in wallet_bumpfee
as the feeRate argument should soon be deprecated. Also loosen one test (and a similar one) that caused a one-off CI failure with: expected message 'Insufficient total fee 0.00000141, must be at least 0.00001704 (oldFee 0.00000999 + incrementalFee 0.00000705)' actual message 'Insufficient total fee 0.00000141, must be at least 0.00001712 (oldFee 0.00001007 + incrementalFee 0.00000705)'
1 parent 1b3d700 commit 3f1e10b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

test/functional/wallet_bumpfee.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,10 @@ def test_invalid_parameters(self, rbf_node, peer_node, dest_address):
107107
assert_raises_rpc_error(-3, "Unexpected key {}".format(key), rbf_node.bumpfee, rbfid, {key: NORMAL})
108108

109109
# Bumping to just above minrelay should fail to increase the total fee enough.
110-
assert_raises_rpc_error(-8, "Insufficient total fee 0.00000141, must be at least 0.00001704 (oldFee 0.00000999 + incrementalFee 0.00000705)",
111-
rbf_node.bumpfee, rbfid, {"fee_rate": INSUFFICIENT})
110+
assert_raises_rpc_error(-8, "Insufficient total fee 0.00000141", rbf_node.bumpfee, rbfid, {"fee_rate": INSUFFICIENT})
112111

113112
self.log.info("Test invalid fee rate settings")
114-
assert_raises_rpc_error(-8, "Insufficient total fee 0.00, must be at least 0.00001704 (oldFee 0.00000999 + incrementalFee 0.00000705)",
115-
rbf_node.bumpfee, rbfid, {"fee_rate": 0})
113+
assert_raises_rpc_error(-8, "Insufficient total fee 0.00", rbf_node.bumpfee, rbfid, {"fee_rate": 0})
116114
assert_raises_rpc_error(-4, "Specified or calculated fee 0.141 is too high (cannot be higher than -maxtxfee 0.10",
117115
rbf_node.bumpfee, rbfid, {"fee_rate": TOO_HIGH})
118116
assert_raises_rpc_error(-3, "Amount out of range", rbf_node.bumpfee, rbfid, {"fee_rate": -1})
@@ -421,7 +419,7 @@ def test_watchonly_psbt(self, peer_node, rbf_node, dest_address):
421419
self.sync_all()
422420

423421
# Create single-input PSBT for transaction to be bumped
424-
psbt = watcher.walletcreatefundedpsbt([], {dest_address: 0.0005}, 0, {"feeRate": 0.00001}, True)['psbt']
422+
psbt = watcher.walletcreatefundedpsbt([], {dest_address: 0.0005}, 0, {"fee_rate": 1}, True)['psbt']
425423
psbt_signed = signer.walletprocesspsbt(psbt=psbt, sign=True, sighashtype="ALL", bip32derivs=True)
426424
psbt_final = watcher.finalizepsbt(psbt_signed["psbt"])
427425
original_txid = watcher.sendrawtransaction(psbt_final["hex"])

0 commit comments

Comments
 (0)