Skip to content

Commit ea6f76b

Browse files
committed
test: improve zero-value explicit fee rate coverage
1 parent 9c05da4 commit ea6f76b

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

test/functional/rpc_fundrawtransaction.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"""Test the fundrawtransaction RPC."""
66

77
from decimal import Decimal
8+
from itertools import product
9+
810
from test_framework.descriptors import descsum_create
911
from test_framework.test_framework import BitcoinTestFramework
1012
from test_framework.util import (
@@ -723,17 +725,16 @@ def test_option_feerate(self):
723725
result2 = node.fundrawtransaction(rawtx, {"feeRate": 2 * self.min_relay_tx_fee})
724726
result3 = node.fundrawtransaction(rawtx, {"fee_rate": 10 * btc_kvb_to_sat_vb * self.min_relay_tx_fee})
725727
result4 = node.fundrawtransaction(rawtx, {"feeRate": str(10 * self.min_relay_tx_fee)})
726-
# Test that funding non-standard "zero-fee" transactions is valid.
727-
result5 = self.nodes[3].fundrawtransaction(rawtx, {"fee_rate": 0})
728-
result6 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 0})
729728

730729
result_fee_rate = result['fee'] * 1000 / count_bytes(result['hex'])
731730
assert_fee_amount(result1['fee'], count_bytes(result1['hex']), 2 * result_fee_rate)
732731
assert_fee_amount(result2['fee'], count_bytes(result2['hex']), 2 * result_fee_rate)
733732
assert_fee_amount(result3['fee'], count_bytes(result3['hex']), 10 * result_fee_rate)
734733
assert_fee_amount(result4['fee'], count_bytes(result4['hex']), 10 * result_fee_rate)
735-
assert_fee_amount(result5['fee'], count_bytes(result5['hex']), 0)
736-
assert_fee_amount(result6['fee'], count_bytes(result6['hex']), 0)
734+
735+
# Test that funding non-standard "zero-fee" transactions is valid.
736+
for param, zero_value in product(["fee_rate", "feeRate"], [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]):
737+
assert_equal(self.nodes[3].fundrawtransaction(rawtx, {param: zero_value})["fee"], 0)
737738

738739
# With no arguments passed, expect fee of 141 satoshis.
739740
assert_approx(node.fundrawtransaction(rawtx)["fee"], vexp=0.00000141, vspan=0.00000001)

test/functional/rpc_psbt.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"""
77

88
from decimal import Decimal
9+
from itertools import product
10+
911
from test_framework.test_framework import BitcoinTestFramework
1012
from test_framework.util import (
1113
assert_approx,
@@ -199,8 +201,8 @@ def run_test(self):
199201
assert_approx(res4["fee"], 0.00000381, 0.0000001)
200202

201203
self.log.info("Test min fee rate checks with walletcreatefundedpsbt are bypassed and that funding non-standard 'zero-fee' transactions is valid")
202-
for param in ["fee_rate", "feeRate"]:
203-
assert_equal(self.nodes[1].walletcreatefundedpsbt(inputs, outputs, 0, {param: 0, "add_inputs": True})["fee"], 0)
204+
for param, zero_value in product(["fee_rate", "feeRate"], [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]):
205+
assert_equal(0, self.nodes[1].walletcreatefundedpsbt(inputs, outputs, 0, {param: zero_value, "add_inputs": True})["fee"])
204206

205207
self.log.info("Test invalid fee rate settings")
206208
for param, value in {("fee_rate", 100000), ("feeRate", 1)}:

test/functional/wallet_basic.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,11 @@ def run_test(self):
267267
self.nodes[2].sendmany, amounts={address: 10}, fee_rate=0.99999999)
268268

269269
self.log.info("Test sendmany raises if fee_rate of 0 or -1 is passed")
270-
assert_raises_rpc_error(-6, "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)",
271-
self.nodes[2].sendmany, amounts={address: 10}, fee_rate=0)
270+
# Test fee_rate with zero values.
271+
msg = "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"
272+
for zero_value in [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]:
273+
assert_raises_rpc_error(-6, msg, self.nodes[2].sendmany, amounts={address: 1}, fee_rate=zero_value)
274+
# Test fee_rate out of range (negative number).
272275
assert_raises_rpc_error(-3, OUT_OF_RANGE, self.nodes[2].sendmany, amounts={address: 10}, fee_rate=-1)
273276

274277
self.log.info("Test sendmany raises if an invalid conf_target or estimate_mode is passed")
@@ -450,8 +453,11 @@ def run_test(self):
450453
self.nodes[2].sendtoaddress, address=address, amount=1, fee_rate=0.99999999)
451454

452455
self.log.info("Test sendtoaddress raises if fee_rate of 0 or -1 is passed")
453-
assert_raises_rpc_error(-6, "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)",
454-
self.nodes[2].sendtoaddress, address=address, amount=10, fee_rate=0)
456+
# Test fee_rate with zero values.
457+
msg = "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"
458+
for zero_value in [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]:
459+
assert_raises_rpc_error(-6, msg, self.nodes[2].sendtoaddress, address=address, amount=1, fee_rate=zero_value)
460+
# Test fee_rate out of range (negative number).
455461
assert_raises_rpc_error(-3, OUT_OF_RANGE, self.nodes[2].sendtoaddress, address=address, amount=1.0, fee_rate=-1)
456462

457463
self.log.info("Test sendtoaddress raises if an invalid conf_target or estimate_mode is passed")

test/functional/wallet_bumpfee.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,13 @@ def test_invalid_parameters(self, rbf_node, peer_node, dest_address):
110110
assert_raises_rpc_error(-8, "Insufficient total fee 0.00000141", rbf_node.bumpfee, rbfid, {"fee_rate": INSUFFICIENT})
111111

112112
self.log.info("Test invalid fee rate settings")
113-
assert_raises_rpc_error(-8, "Insufficient total fee 0.00", rbf_node.bumpfee, rbfid, {"fee_rate": 0})
114113
assert_raises_rpc_error(-4, "Specified or calculated fee 0.141 is too high (cannot be higher than -maxtxfee 0.10",
115114
rbf_node.bumpfee, rbfid, {"fee_rate": TOO_HIGH})
115+
# Test fee_rate with zero values.
116+
msg = "Insufficient total fee 0.00"
117+
for zero_value in [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]:
118+
assert_raises_rpc_error(-8, msg, rbf_node.bumpfee, rbfid, {"fee_rate": zero_value})
119+
# Test fee_rate out of range (negative number).
116120
assert_raises_rpc_error(-3, "Amount out of range", rbf_node.bumpfee, rbfid, {"fee_rate": -1})
117121
for value in [{"foo": "bar"}, True]:
118122
assert_raises_rpc_error(-3, "Amount is not a number or string", rbf_node.bumpfee, rbfid, {"fee_rate": value})

test/functional/wallet_send.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,16 +349,17 @@ def run_test(self):
349349
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, conf_target=v, estimate_mode=mode,
350350
expect_error=(-3, "Expected type number for conf_target, got {}".format(k)))
351351

352-
# Test setting explicit fee rate just below the minimum and at zero.
352+
# Test setting explicit fee rate just below the minimum of 1 sat/vB.
353353
self.log.info("Explicit fee rate raises RPC error 'fee rate too low' if fee_rate of 0.99999999 is passed")
354354
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, fee_rate=0.99999999,
355355
expect_error=(-4, "Fee rate (0.999 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"))
356356
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, arg_fee_rate=0.99999999,
357357
expect_error=(-4, "Fee rate (0.999 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"))
358-
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, fee_rate=0,
359-
expect_error=(-4, "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"))
360-
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, arg_fee_rate=0,
361-
expect_error=(-4, "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"))
358+
# Test fee_rate with zero values.
359+
msg = "Fee rate (0.000 sat/vB) is lower than the minimum fee rate setting (1.000 sat/vB)"
360+
for zero_value in [0, 0.000, 0.00000000, "0", "0.000", "0.00000000"]:
361+
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, fee_rate=zero_value, expect_error=(-4, msg))
362+
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, arg_fee_rate=zero_value, expect_error=(-4, msg))
362363

363364
# TODO: Return hex if fee rate is below -maxmempool
364365
# res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, conf_target=0.1, estimate_mode="sat/b", add_to_wallet=False)

0 commit comments

Comments
 (0)