diff options
| author | Jon Atack <jon@atack.com> | 2020-10-24 19:48:04 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2020-10-25 00:35:38 +0200 |
| commit | fc5721723d34f76f9e1ffd2e31f274ea6b22f894 (patch) | |
| tree | 83da373059ecdf20290f7b7a8ba76a4971fd1fc1 | |
| parent | 052427eef1c9da84c474c5161b1910d3328ef0da (diff) | |
| download | bitcoin-fc5721723d34f76f9e1ffd2e31f274ea6b22f894.tar.xz | |
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.
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 2 | ||||
| -rwxr-xr-x | test/functional/wallet_basic.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 46e27bb4bf..614227fde2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -214,7 +214,7 @@ static void SetFeeEstimateMode(const CWallet* pwallet, CCoinControl& cc, const U if (cc.m_fee_mode == FeeEstimateMode::BTC_KB || cc.m_fee_mode == FeeEstimateMode::SAT_B) { if (estimate_param.isNull()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Selected estimate_mode requires a fee rate"); + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Selected estimate_mode %s requires a fee rate to be specified in conf_target", estimate_mode.get_str())); } CAmount fee_rate = AmountFromValue(estimate_param); diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 689a0fa4df..7edcf41bea 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -228,7 +228,7 @@ class WalletTest(BitcoinTestFramework): # Sendmany with explicit fee (BTC/kB) # Throw if no conf_target provided - assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate", + assert_raises_rpc_error(-8, "Selected estimate_mode bTc/kB requires a fee rate to be specified in conf_target", self.nodes[2].sendmany, amounts={ address: 10 }, estimate_mode='bTc/kB') @@ -254,7 +254,7 @@ class WalletTest(BitcoinTestFramework): # Sendmany with explicit fee (SAT/B) # Throw if no conf_target provided - assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate", + assert_raises_rpc_error(-8, "Selected estimate_mode sat/b requires a fee rate to be specified in conf_target", self.nodes[2].sendmany, amounts={ address: 10 }, estimate_mode='sat/b') @@ -421,7 +421,7 @@ class WalletTest(BitcoinTestFramework): assert prebalance > 2 address = self.nodes[1].getnewaddress() # Throw if no conf_target provided - assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate", + assert_raises_rpc_error(-8, "Selected estimate_mode BTc/Kb requires a fee rate to be specified in conf_target", self.nodes[2].sendtoaddress, address=address, amount=1.0, @@ -455,7 +455,7 @@ class WalletTest(BitcoinTestFramework): assert prebalance > 2 address = self.nodes[1].getnewaddress() # Throw if no conf_target provided - assert_raises_rpc_error(-8, "Selected estimate_mode requires a fee rate", + assert_raises_rpc_error(-8, "Selected estimate_mode SAT/b requires a fee rate to be specified in conf_target", self.nodes[2].sendtoaddress, address=address, amount=1.0, |