[0.13] Disable fee estimates for a confirm target of 1 block #9267

Merged
merged 1 commit into from Dec 3, 2016

Projects

None yet

6 participants

@morcos
Contributor
morcos commented Dec 2, 2016

For 0.13.2

Backport of #9239 without GUI changes and fixing conflicts in tests.

Tested and it works just as if the estimation algo would have returned -1 in which case you can still set the slider to the 1 block confirmation target but it gives you an answer for 2 (and tells you so).

@laanwj some slight conflicts in the test, so i fixed them up here.

@morcos morcos Disable fee estimates for a confirm target of 1 block
Backport of #9239 without GUI changes and fixing conflicts in tests.
3688866
@MarcoFalke MarcoFalke added the Backport label Dec 2, 2016
@MarcoFalke MarcoFalke added this to the 0.13.2 milestone Dec 2, 2016
@@ -791,6 +791,8 @@ UniValue estimatefee(const UniValue& params, bool fHelp)
"\n"
"A negative value is returned if not enough transactions and blocks\n"
"have been observed to make an estimate.\n"
+ "-1 is always returned for nblocks == 1 as it is impossible to calculate\n"
@dcousens
dcousens Dec 3, 2016 edited Contributor

-1 is always returned for nblocks == 1

if (confTarget == 1) confTarget = 2;

Which is it? Or am I was misunderstanding the changes ?

edit: nevermind

@gmaxwell
Member
gmaxwell commented Dec 3, 2016

utACK.

@laanwj
Member
laanwj commented Dec 3, 2016

Thanks. utACK 3688866

@laanwj laanwj merged commit 3688866 into bitcoin:0.13 Dec 3, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@laanwj laanwj added a commit that referenced this pull request Dec 3, 2016
@laanwj laanwj Merge #9267: Disable fee estimates for a confirm target of 1 block
3688866 Disable fee estimates for a confirm target of 1 block (Alex Morcos)
0a4aa87
@shyii
shyii commented Dec 3, 2016

Sharday

@MarcoFalke MarcoFalke changed the title from Disable fee estimates for a confirm target of 1 block to [0.13] Disable fee estimates for a confirm target of 1 block Dec 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment