Skip to content

Commit fc57217

Browse files
committed
wallet: fix SetFeeEstimateMode() error message
to clarify for the user the confusing error message that the missing fee rate needs to be set in the conf_target param/option.
1 parent 052427e commit fc57217

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static void SetFeeEstimateMode(const CWallet* pwallet, CCoinControl& cc, const U
214214

215215
if (cc.m_fee_mode == FeeEstimateMode::BTC_KB || cc.m_fee_mode == FeeEstimateMode::SAT_B) {
216216
if (estimate_param.isNull()) {
217-
throw JSONRPCError(RPC_INVALID_PARAMETER, "Selected estimate_mode requires a fee rate");
217+
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Selected estimate_mode %s requires a fee rate to be specified in conf_target", estimate_mode.get_str()));
218218
}
219219

220220
CAmount fee_rate = AmountFromValue(estimate_param);

test/functional/wallet_basic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def run_test(self):
228228

229229
# Sendmany with explicit fee (BTC/kB)
230230
# Throw if no conf_target provided
231-
assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate",
231+
assert_raises_rpc_error(-8, "Selected estimate_mode bTc/kB requires a fee rate to be specified in conf_target",
232232
self.nodes[2].sendmany,
233233
amounts={ address: 10 },
234234
estimate_mode='bTc/kB')
@@ -254,7 +254,7 @@ def run_test(self):
254254

255255
# Sendmany with explicit fee (SAT/B)
256256
# Throw if no conf_target provided
257-
assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate",
257+
assert_raises_rpc_error(-8, "Selected estimate_mode sat/b requires a fee rate to be specified in conf_target",
258258
self.nodes[2].sendmany,
259259
amounts={ address: 10 },
260260
estimate_mode='sat/b')
@@ -421,7 +421,7 @@ def run_test(self):
421421
assert prebalance > 2
422422
address = self.nodes[1].getnewaddress()
423423
# Throw if no conf_target provided
424-
assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate",
424+
assert_raises_rpc_error(-8, "Selected estimate_mode BTc/Kb requires a fee rate to be specified in conf_target",
425425
self.nodes[2].sendtoaddress,
426426
address=address,
427427
amount=1.0,
@@ -455,7 +455,7 @@ def run_test(self):
455455
assert prebalance > 2
456456
address = self.nodes[1].getnewaddress()
457457
# Throw if no conf_target provided
458-
assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate",
458+
assert_raises_rpc_error(-8, "Selected estimate_mode SAT/b requires a fee rate to be specified in conf_target",
459459
self.nodes[2].sendtoaddress,
460460
address=address,
461461
amount=1.0,

0 commit comments

Comments
 (0)