diff options
| author | Matt Corallo <[email protected]> | 2015-10-14 12:44:18 -0700 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2015-10-14 12:44:18 -0700 |
| commit | 8abe0f56584ff49ad250115eb1f0a9ac8f9cf0ca (patch) | |
| tree | d73b44f802177659fb65ddb71b1316543adbcde0 /src/txmempool.cpp | |
| parent | Drop minRelayTxFee to 1000 (diff) | |
| download | discoin-8abe0f56584ff49ad250115eb1f0a9ac8f9cf0ca.tar.xz discoin-8abe0f56584ff49ad250115eb1f0a9ac8f9cf0ca.zip | |
Undo GetMinFee-requires-extra-call-to-hit-0
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 7563c0788..9a651049d 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -879,8 +879,10 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const { rollingMinimumFeeRate = rollingMinimumFeeRate / pow(2.0, (time - lastRollingFeeUpdate) / halflife); lastRollingFeeUpdate = time; - if (rollingMinimumFeeRate < minReasonableRelayFee.GetFeePerK() / 2) + if (rollingMinimumFeeRate < minReasonableRelayFee.GetFeePerK() / 2) { rollingMinimumFeeRate = 0; + return CFeeRate(0); + } } return std::max(CFeeRate(rollingMinimumFeeRate), minReasonableRelayFee); } |