diff options
author | Alex Morcos <morcos@chaincode.com> | 2017-01-19 15:17:33 -0500 |
---|---|---|
committer | Alex Morcos <morcos@chaincode.com> | 2017-02-27 11:23:51 -0500 |
commit | fe282acd7604b5265762b24e531bdf1ebb1f009b (patch) | |
tree | 4f10b6a0221b8b706d58458f31855673c13fb36b /src/policy | |
parent | 400b15147cf1c4757927935222611e8d3481e739 (diff) |
[cleanup] Remove estimatePriority and estimateSmartPriority
Unused everywhere now except one test.
Diffstat (limited to 'src/policy')
-rw-r--r-- | src/policy/fees.cpp | 18 | ||||
-rw-r--r-- | src/policy/fees.h | 15 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 8f6a1e60f4..89220f26b6 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -452,24 +452,6 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun return CFeeRate(median); } -double CBlockPolicyEstimator::estimatePriority(int confTarget) -{ - return -1; -} - -double CBlockPolicyEstimator::estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool) -{ - if (answerFoundAtTarget) - *answerFoundAtTarget = confTarget; - - // If mempool is limiting txs, no priority txs are allowed - CAmount minPoolFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); - if (minPoolFee > 0) - return INF_PRIORITY; - - return -1; -} - void CBlockPolicyEstimator::Write(CAutoFile& fileout) { fileout << nBestSeenHeight; diff --git a/src/policy/fees.h b/src/policy/fees.h index 064466afe4..f2f430861c 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -182,7 +182,6 @@ static const double SUFFICIENT_FEETXS = 1; static constexpr double MIN_FEERATE = 10; static const double MAX_FEERATE = 1e7; static const double INF_FEERATE = MAX_MONEY; -static const double INF_PRIORITY = 1e9 * MAX_MONEY; // We have to lump transactions into buckets based on feerate, but we want to be able // to give accurate estimates over a large range of potential feerates @@ -223,20 +222,6 @@ public: */ CFeeRate estimateSmartFee(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool); - /** Return a priority estimate. - * DEPRECATED - * Returns -1 - */ - double estimatePriority(int confTarget); - - /** Estimate priority needed to get be included in a block within - * confTarget blocks. - * DEPRECATED - * Returns -1 unless mempool is currently limited then returns INF_PRIORITY - * answerFoundAtTarget is set to confTarget - */ - double estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool); - /** Write estimation data to a file */ void Write(CAutoFile& fileout); |