Consensus: Remove calls to error() from ContextualCheckBlock #8341
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
ACK e7ad8a7 |
| // witness tree. | ||
| if (block.vtx[0].wit.vtxinwit.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.size() != 1 || block.vtx[0].wit.vtxinwit[0].scriptWitness.stack[0].size() != 32) { | ||
| return state.DoS(100, error("%s : invalid witness nonce size", __func__), REJECT_INVALID, "bad-witness-nonce-size", true); | ||
| return state.DoS(100, false, REJECT_INVALID, "bad-witness-nonce-size", true, strprintf("%s : invalid witness nonce size", __func__)); |
Contributor
There was a problem hiding this comment.
I'm not sure if it's worth keeping the func but I'm not against it.
Member
There was a problem hiding this comment.
Tend to agree with @jtimon. I think it was removed in other places where information was migrated to the debug message.
Member
There was a problem hiding this comment.
Agree with removing. I don't think function names are very useful to most debug.log readers, and to those that are, you can just grep the source code for the message. Though perhaps we should do a combined effort of fixing it everywhere. ACK with or without func
Contributor
|
ACK e7ad8a7 |
Member
|
Needs rebase |
Member
|
utACK (with or without func), but needs rebase. |
NicolasDorier
force-pushed
the
error-calls
branch
from
e7ad8a7 to
5e26165
Compare
NicolasDorier
force-pushed
the
error-calls
branch
from
5e26165 to
7821889
Compare
Contributor
Author
|
rebased |
laanwj
added a commit
that referenced
this pull request
Jul 21, 2016
…lock 7821889 Consensus: Remove calls to error() from ContextualCheckBlock (NicolasDorier)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is only two callers of ContextualCheckBlock, and they already print errors:
https://github.com/bitcoin/bitcoin/blob/master/src/main.cpp#L3780
https://github.com/bitcoin/bitcoin/blob/master/src/main.cpp#L3689
It is using the same way as #7287 by @jtimon