diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-06-29 13:13:23 -0400 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-07-14 23:41:40 -0400 |
| commit | fd29d3df299bd06c0e6bb218863e0c855b3b91af (patch) | |
| tree | d0f352d9fcf19a7268586b92a3930a5916eef43b /src/policy/fees.h | |
| parent | 2fffaa97381f741786fff2e6ff25f4b9a74037fe (diff) | |
| download | bitcoin-fd29d3df299bd06c0e6bb218863e0c855b3b91af.tar.xz | |
Remove checking of mempool min fee from estimateSmartFee.
This check has been moved to the wallet logic GetMinimumFee. The rpc call to
estimatesmartfee will now no longer return a result maxed with the mempool min
fee, but automated fee calculations from the wallet will produce the same result
as before and coincontrol and sendcoins dialogs in the GUI will correctly
display the right prospective fee.
changes to policy/fees.cpp include a big whitespace indentation change.
Diffstat (limited to 'src/policy/fees.h')
| -rw-r--r-- | src/policy/fees.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/policy/fees.h b/src/policy/fees.h index 4c80371c5c..f4ef793643 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -208,7 +208,7 @@ public: * the closest target where one can be given. 'conservative' estimates are * valid over longer time horizons also. */ - CFeeRate estimateSmartFee(int confTarget, FeeCalculation *feeCalc, const CTxMemPool& pool, bool conservative) const; + CFeeRate estimateSmartFee(int confTarget, FeeCalculation *feeCalc, bool conservative) const; /** Return a specific fee estimate calculation with a given success * threshold and time horizon, and optionally return detailed data about |