diff options
| author | Gregory Sanders <gsanders87@gmail.com> | 2019-08-20 09:58:35 -0400 |
|---|---|---|
| committer | Gregory Sanders <gsanders87@gmail.com> | 2019-10-03 14:03:27 -0400 |
| commit | 6a51f7951716d6d6fc0f9b56028f3a0dd02b61c8 (patch) | |
| tree | 3f5666c9f0821de16377da5bb355c6f2529a464e /src | |
| parent | 8e59af55aaf1b196575084bce2448af02d97d745 (diff) | |
| download | bitcoin-6a51f7951716d6d6fc0f9b56028f3a0dd02b61c8.tar.xz | |
Disallow implicit conversion for CFeeRate constructor
Diffstat (limited to 'src')
| -rw-r--r-- | src/policy/feerate.h | 2 | ||||
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/policy/feerate.h b/src/policy/feerate.h index 85d7d22b4f..d081f2ce8e 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -25,7 +25,7 @@ public: /** Fee rate of 0 satoshis per kB */ CFeeRate() : nSatoshisPerK(0) { } template<typename I> - CFeeRate(const I _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { + explicit CFeeRate(const I _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { // We've previously had bugs creep in from silent double->int conversion... static_assert(std::is_integral<I>::value, "CFeeRate should be used without floats"); } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 96fa50d42e..0904c03669 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2327,7 +2327,7 @@ static UniValue settxfee(const JSONRPCRequest& request) CAmount nAmount = AmountFromValue(request.params[0]); CFeeRate tx_fee_rate(nAmount, 1000); - if (tx_fee_rate == 0) { + if (tx_fee_rate == CFeeRate(0)) { // automatic selection } else if (tx_fee_rate < pwallet->chain().relayMinFee()) { throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("txfee cannot be less than min relay tx fee (%s)", pwallet->chain().relayMinFee().ToString())); @@ -3386,7 +3386,7 @@ static UniValue bumpfee(const JSONRPCRequest& request) } } else if (options.exists("fee_rate")) { CFeeRate fee_rate(AmountFromValue(options["fee_rate"])); - if (fee_rate <= 0) { + 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; |