[cleanup] Remove estimatePriority

Unused everywhere now except one test.

(cherry picked from commit bitcoin/bitcoin@fe282acd76)

Zcash: We don't have `estimateSmartPriority` which was also removed in
the upstream commit. We have to keep `MAX_PRIORITY` for a little longer
because `CCoinsViewCache::GetPriority` still uses it.

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
This commit is contained in:
Alex Morcos 2017-01-19 15:17:33 -05:00 committed by Daira Emma Hopwood
parent 335ac369ea
commit 1a57b52109
4 changed files with 0 additions and 20 deletions

View File

@ -422,11 +422,6 @@ CFeeRate CBlockPolicyEstimator::estimateFee(int confTarget)
return CFeeRate(median);
}
double CBlockPolicyEstimator::estimatePriority(int confTarget)
{
return -1;
}
void CBlockPolicyEstimator::Write(CAutoFile& fileout)
{
fileout << nBestSeenHeight;

View File

@ -193,7 +193,6 @@ static const double INF_FEERATE = MAX_MONEY;
// Maximum priority, used for transactions with shielded components
static const double MAX_PRIORITY = 1e16;
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
@ -228,12 +227,6 @@ public:
/** Return a feerate estimate */
CFeeRate estimateFee(int confTarget);
/** Return a priority estimate.
* DEPRECATED
* Returns -1
*/
double estimatePriority(int confTarget);
/** Write estimation data to a file */
void Write(CAutoFile& fileout);

View File

@ -1095,11 +1095,6 @@ CFeeRate CTxMemPool::estimateFee(int nBlocks) const
LOCK(cs);
return minerPolicyEstimator->estimateFee(nBlocks);
}
double CTxMemPool::estimatePriority(int nBlocks) const
{
LOCK(cs);
return minerPolicyEstimator->estimatePriority(nBlocks);
}
bool
CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const

View File

@ -592,9 +592,6 @@ public:
/** Estimate fee rate needed to get into the next nBlocks */
CFeeRate estimateFee(int nBlocks) const;
/** Estimate priority needed to get into the next nBlocks */
double estimatePriority(int nBlocks) const;
/** Write/Read estimates to disk */
bool WriteFeeEstimates(CAutoFile& fileout) const;
bool ReadFeeEstimates(CAutoFile& filein);