diff options
| author | Alex Morcos <[email protected]> | 2017-02-15 15:23:34 -0500 |
|---|---|---|
| committer | Alex Morcos <[email protected]> | 2017-04-10 13:56:50 -0400 |
| commit | 14e10aa842b8583f9648accd5d151dbdf342b9dc (patch) | |
| tree | bd9cb352c1734d8ec7dbd87fee74b1f91e77644b /src/rpc/mining.cpp | |
| parent | Give CBlockPolicyEstimator it's own lock (diff) | |
| download | discoin-14e10aa842b8583f9648accd5d151dbdf342b9dc.tar.xz discoin-14e10aa842b8583f9648accd5d151dbdf342b9dc.zip | |
Call estimate(Smart)Fee directly from CBlockPolicyEstimator
Diffstat (limited to 'src/rpc/mining.cpp')
| -rw-r--r-- | src/rpc/mining.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 7e5f0d608..4aad267b8 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -15,6 +15,7 @@ #include "validation.h" #include "miner.h" #include "net.h" +#include "policy/fees.h" #include "pow.h" #include "rpc/blockchain.h" #include "rpc/server.h" @@ -819,7 +820,7 @@ UniValue estimatefee(const JSONRPCRequest& request) if (nBlocks < 1) nBlocks = 1; - CFeeRate feeRate = mempool.estimateFee(nBlocks); + CFeeRate feeRate = ::feeEstimator.estimateFee(nBlocks); if (feeRate == CFeeRate(0)) return -1.0; @@ -857,7 +858,7 @@ UniValue estimatesmartfee(const JSONRPCRequest& request) UniValue result(UniValue::VOBJ); int answerFound; - CFeeRate feeRate = mempool.estimateSmartFee(nBlocks, &answerFound); + CFeeRate feeRate = ::feeEstimator.estimateSmartFee(nBlocks, &answerFound, ::mempool); result.push_back(Pair("feerate", feeRate == CFeeRate(0) ? -1.0 : ValueFromAmount(feeRate.GetFeePerK()))); result.push_back(Pair("blocks", answerFound)); return result; |