This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
removed redundant fork choice abstraction #10849
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,7 +40,7 @@ use types::encoded; | |
use types::filter::Filter; | ||
use types::log_entry::LocalizedLogEntry; | ||
use types::receipt::{Receipt, LocalizedReceipt}; | ||
use types::{BlockNumber, header::{Header, ExtendedHeader}}; | ||
use types::{BlockNumber, header::Header}; | ||
use vm::{EnvInfo, LastHashes}; | ||
use hash_db::EMPTY_PREFIX; | ||
use block::{LockedBlock, Drain, ClosedBlock, OpenBlock, enact_verified, SealedBlock}; | ||
|
@@ -501,32 +501,24 @@ impl Importer { | |
let traces = block.traces.drain(); | ||
let best_hash = chain.best_block_hash(); | ||
|
||
let new = ExtendedHeader { | ||
header: header.clone(), | ||
is_finalized, | ||
parent_total_difficulty: chain.block_details(&parent).expect("Parent block is in the database; qed").total_difficulty | ||
let new_total_difficulty = { | ||
let parent_total_difficulty = chain.block_details(&parent) | ||
.expect("Parent block is in the database; qed") | ||
.total_difficulty; | ||
parent_total_difficulty + header.difficulty() | ||
}; | ||
|
||
let best = { | ||
let header = chain.block_header_data(&best_hash) | ||
.expect("Best block is in the database; qed") | ||
.decode() | ||
.expect("Stored block header is valid RLP; qed"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. redundant database query and block header decoding |
||
let details = chain.block_details(&best_hash) | ||
.expect("Best block is in the database; qed"); | ||
|
||
ExtendedHeader { | ||
parent_total_difficulty: details.total_difficulty - *header.difficulty(), | ||
is_finalized: details.is_finalized, | ||
header, | ||
} | ||
}; | ||
let best_total_difficulty = chain.block_details(&best_hash) | ||
.expect("Best block is in the database; qed") | ||
.total_difficulty; | ||
|
||
let route = chain.tree_route(best_hash, *parent).expect("forks are only kept when it has common ancestors; tree route from best to prospective's parent always exists; qed"); | ||
let fork_choice = if route.is_from_route_finalized { | ||
ForkChoice::Old | ||
} else if new_total_difficulty > best_total_difficulty { | ||
ForkChoice::New | ||
} else { | ||
self.engine.fork_choice(&new, &best) | ||
ForkChoice::Old | ||
}; | ||
|
||
// CHECK! I *think* this is fine, even if the state_root is equal to another | ||
|
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
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
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
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
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
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
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
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
redundant clone