highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-15 00:59:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: remove redundant bumpfee fee_rate checks

Browse Source 
SetFeeEstimateMode() handles these checks now and provides a more actionable
error message.
This commit is contained in:
Jon Atack
2020-11-09 15:00:31 +01:00
parent a0d4957473
commit 410e471fa4
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/rpcwallet.cpp
View File

@@ -3474,18 +3474,6 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
auto conf_target = options.exists("confTarget") ? options["confTarget"] : options["conf_target"];
if (!conf_target.isNull()) {
if (options.exists("fee_rate")) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot specify both conf_target and fee_rate. Please provide either a confirmation target in blocks for automatic fee estimation, or an explicit fee rate.");
}
} else if (options.exists("fee_rate")) {
CFeeRate fee_rate(AmountFromValue(options["fee_rate"]));
if (fee_rate <= CFeeRate(0)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid fee_rate %s (must be greater than 0)", fee_rate.ToString()));
}
coin_control.m_feerate = fee_rate;
}
if (options.exists("replaceable")) {
coin_control.m_signal_bip125_rbf = options["replaceable"].get_bool();
}