Refactor branch walk #1175 #1176
Merged
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
theoreticalbts
force-pushed
the
1175-refactor-branch-walk
branch
from
14868ad to
4ad2512
Compare
mvandeberg
suggested changes
Jun 8, 2017
libraries/chain/database.cpp
Outdated
| witness_time_pairs.push_back( std::make_pair( b->data.witness, b->data.timestamp ) ); | ||
| } | ||
|
|
||
| ilog( "Encountered a block num collision due to a fork. Walking the current fork to determine the correct block. block_num:${n}", ("n", height) ); |
Contributor
There was a problem hiding this comment.
We should combine these messages and make the logging accurate. Something like, "Encountered block num collision at block ${n} produced by witnesses ${w}" This also removes the statement that we are walking the fork, which we are not doing at this point in the code.
Contributor
Author
|
Still not building. Will fix the build and address the above comment momentarily. |
theoreticalbts
force-pushed
the
1175-refactor-branch-walk
branch
from
4ad2512 to
1f80f5f
Compare
mvandeberg
reviewed
Jun 8, 2017
libraries/chain/database.cpp
Outdated
| return result; | ||
| } | ||
|
|
||
| void database::_maybe_warn_multiple_production( const database& db, uint32_t height )const |
Contributor
There was a problem hiding this comment.
If this method is a member of database, why pass a const reference to itself?
Contributor
Author
There was a problem hiding this comment.
Good catch, originally it wasn't, but then I saw _fork_db was private.
mvandeberg
approved these changes
Jun 8, 2017
theoreticalbts
force-pushed
the
1175-refactor-branch-walk
branch
from
0422f28 to
33ecf12
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR for #1175