eth, miner: perfer to locally generated uncle #17715
Merged
Conversation
This file contains 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
rjl493456442
requested review from
holiman,
karalabe and
zsfelfoldi
as code owners
karalabe
reviewed
Sep 20, 2018
karalabe
reviewed
Sep 20, 2018
miner/worker.go
Outdated
| uncles = append(uncles, uncle.Header()) | ||
| } | ||
| uncles := make([]*types.Header, 0, 2) | ||
| commitUncle := func(blocks map[common.Hash]*types.Block) { |
There was a problem hiding this comment.
commitUncle -> commitUncles
Might as well move the uncle cleaning loop in here too, removes some code duplication.
rjl493456442
force-pushed
the
perfer-local-uncle
branch
from
e01e0b2
to
d8d02bd
Compare
karalabe
force-pushed
the
perfer-local-uncle
branch
2 times, most recently
from
b48fa5a
to
f137c30
Compare
rjl493456442
force-pushed
the
perfer-local-uncle
branch
from
f137c30
to
96fffc7
Compare
nizsheanez
referenced
this pull request
in nizsheanez/go-ethereum
Sep 21, 2018
* core, eth: fix dependency cycle * eth, miner: perfer to locally generated uncle
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.
Need to wait #17720 be merged first