diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-06-13 13:44:52 -0400 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-07-06 22:20:23 -0400 |
| commit | e0738e3d319ab50466bf76c95841bb7275ad4d22 (patch) | |
| tree | 8b7ea639c1024426e5fe0e465f911568e5c007c2 /src | |
| parent | d507c301bc49c72ed7303658a309e7d204134f80 (diff) | |
| download | bitcoin-e0738e3d319ab50466bf76c95841bb7275ad4d22.tar.xz | |
remove default argument from estimateSmartFee
Diffstat (limited to 'src')
| -rw-r--r-- | src/policy/fees.h | 2 | ||||
| -rw-r--r-- | src/test/policyestimator_tests.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/policy/fees.h b/src/policy/fees.h index 8a98e55520..059415418d 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -204,7 +204,7 @@ public: * the closest target where one can be given. 'conservative' estimates are * valid over longer time horizons also. */ - CFeeRate estimateSmartFee(int confTarget, FeeCalculation *feeCalc, const CTxMemPool& pool, bool conservative = true) const; + CFeeRate estimateSmartFee(int confTarget, FeeCalculation *feeCalc, const CTxMemPool& pool, bool conservative) const; /** Return a specific fee estimate calculation with a given success * threshold and time horizon, and optionally return detailed data about diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index 6bfd315647..8cdd392109 100644 --- a/src/test/policyestimator_tests.cpp +++ b/src/test/policyestimator_tests.cpp @@ -184,8 +184,8 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) mpool.TrimToSize(1); BOOST_CHECK(mpool.GetMinFee(1).GetFeePerK() > feeV[5]); for (int i = 1; i < 10; i++) { - BOOST_CHECK(feeEst.estimateSmartFee(i, NULL, mpool).GetFeePerK() >= feeEst.estimateRawFee(i, 0.85, FeeEstimateHorizon::MED_HALFLIFE).GetFeePerK()); - BOOST_CHECK(feeEst.estimateSmartFee(i, NULL, mpool).GetFeePerK() >= mpool.GetMinFee(1).GetFeePerK()); + BOOST_CHECK(feeEst.estimateSmartFee(i, NULL, mpool, true).GetFeePerK() >= feeEst.estimateRawFee(i, 0.85, FeeEstimateHorizon::MED_HALFLIFE).GetFeePerK()); + BOOST_CHECK(feeEst.estimateSmartFee(i, NULL, mpool, true).GetFeePerK() >= mpool.GetMinFee(1).GetFeePerK()); } } |