diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-02-15 09:24:11 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-04-10 13:51:51 -0400 |
| commit | dbb9e3699b8e835fd72a5db2c22927d828484c32 (patch) | |
| tree | ebbcfd000a92b47b7c882eb0eb003bd55e1075f5 /src/txmempool.cpp | |
| parent | f6187d6e393b5ca587604b678f91496d50149a20 (diff) | |
Give CBlockPolicyEstimator it's own lock
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 3dc7c11f2d..7fac48d3c5 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -845,12 +845,10 @@ TxMempoolInfo CTxMemPool::info(const uint256& hash) const CFeeRate CTxMemPool::estimateFee(int nBlocks) const { - LOCK(cs); return minerPolicyEstimator->estimateFee(nBlocks); } CFeeRate CTxMemPool::estimateSmartFee(int nBlocks, int *answerFoundAtBlocks) const { - LOCK(cs); return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, *this); } @@ -858,7 +856,6 @@ bool CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const { try { - LOCK(cs); fileout << 139900; // version required to read: 0.13.99 or later fileout << CLIENT_VERSION; // version that wrote the file minerPolicyEstimator->Write(fileout); @@ -878,7 +875,6 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein) filein >> nVersionRequired >> nVersionThatWrote; if (nVersionRequired > CLIENT_VERSION) return error("CTxMemPool::ReadFeeEstimates(): up-version (%d) fee estimate file", nVersionRequired); - LOCK(cs); minerPolicyEstimator->Read(filein, nVersionThatWrote); } catch (const std::exception&) { |