Merge 6d81d7aa87 into merged_master (Bitcoin PR #20787)

This commit is contained in:
Andrew Poelstra 2021-06-17 16:46:13 +00:00
commit 07f78541bc
6 changed files with 19 additions and 16 deletions

View file

@ -1182,7 +1182,7 @@ static RPCHelpMan estimaterawfee()
UniValue result(UniValue::VOBJ);
for (const FeeEstimateHorizon horizon : {FeeEstimateHorizon::SHORT_HALFLIFE, FeeEstimateHorizon::MED_HALFLIFE, FeeEstimateHorizon::LONG_HALFLIFE}) {
for (const FeeEstimateHorizon horizon : ALL_FEE_ESTIMATE_HORIZONS) {
CFeeRate feeRate;
EstimationResult buckets;