diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-01-13 16:19:25 -0500 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-01-17 13:19:32 -0500 |
| commit | ac9d3d25f77a25359f362661b0a07afc68b95136 (patch) | |
| tree | 24569a0e632f17ba2368c28bf87bdf7caaa9b43c /src/policy | |
| parent | 6696b4635ceb9b47aaa63244bff9032fa7b08354 (diff) | |
| download | bitcoin-ac9d3d25f77a25359f362661b0a07afc68b95136.tar.xz | |
Change fee estimation bucket limit variable names
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/fees.cpp | 8 | ||||
| -rw-r--r-- | src/policy/fees.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 5407aefb45..89d5003540 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -301,10 +301,10 @@ bool CBlockPolicyEstimator::removeTx(uint256 hash) CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee) : nBestSeenHeight(0), trackedTxs(0), untrackedTxs(0) { - static_assert(MIN_FEERATE > 0, "Min feerate must be nonzero"); - minTrackedFee = _minRelayFee < CFeeRate(MIN_FEERATE) ? CFeeRate(MIN_FEERATE) : _minRelayFee; + static_assert(MIN_BUCKET_FEERATE > 0, "Min feerate must be nonzero"); + minTrackedFee = _minRelayFee < CFeeRate(MIN_BUCKET_FEERATE) ? CFeeRate(MIN_BUCKET_FEERATE) : _minRelayFee; std::vector<double> vfeelist; - for (double bucketBoundary = minTrackedFee.GetFeePerK(); bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) { + for (double bucketBoundary = minTrackedFee.GetFeePerK(); bucketBoundary <= MAX_BUCKET_FEERATE; bucketBoundary *= FEE_SPACING) { vfeelist.push_back(bucketBoundary); } vfeelist.push_back(INF_FEERATE); @@ -492,7 +492,7 @@ FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee) { CAmount minFeeLimit = std::max(CAmount(1), minIncrementalFee.GetFeePerK() / 2); feeset.insert(0); - for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) { + for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_BUCKET_FEERATE; bucketBoundary *= FEE_SPACING) { feeset.insert(bucketBoundary); } } diff --git a/src/policy/fees.h b/src/policy/fees.h index 064466afe4..fbb7816329 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -179,8 +179,8 @@ static const double MIN_SUCCESS_PCT = .95; static const double SUFFICIENT_FEETXS = 1; // Minimum and Maximum values for tracking feerates -static constexpr double MIN_FEERATE = 10; -static const double MAX_FEERATE = 1e7; +static constexpr double MIN_BUCKET_FEERATE = 10; +static const double MAX_BUCKET_FEERATE = 1e7; static const double INF_FEERATE = MAX_MONEY; static const double INF_PRIORITY = 1e9 * MAX_MONEY; |