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
blockchain import_route #645
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8b042ac
blockchain import_route
debris f397fb2
fixed typo
debris 4750d2f
Merge branch 'master' into import_route
debris 0a7cda0
changed route name to enacted and retracted
debris 190a2c3
Merge branch 'master' of github.com:ethcore/parity into import_route
debris File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 |
---|---|---|
|
@@ -18,6 +18,7 @@ use util::numbers::{U256,H256}; | |
use header::BlockNumber; | ||
|
||
/// Brief info about inserted block. | ||
#[derive(Clone)] | ||
pub struct BlockInfo { | ||
/// Block hash. | ||
pub hash: H256, | ||
|
@@ -30,6 +31,7 @@ pub struct BlockInfo { | |
} | ||
|
||
/// Describes location of newly inserted block. | ||
#[derive(Clone)] | ||
pub enum BlockLocation { | ||
/// It's part of the canon chain. | ||
CanonChain, | ||
|
@@ -42,6 +44,8 @@ pub enum BlockLocation { | |
/// Hash of the newest common ancestor with old canon chain. | ||
ancestor: H256, | ||
/// Hashes of the blocks between ancestor and this block. | ||
route: Vec<H256> | ||
route: Vec<H256>, | ||
/// Hashes of the blocks which were invalidated. | ||
old_route: Vec<H256>, | ||
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.
|
||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
// Copyright 2015, 2016 Ethcore (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
//! Import route. | ||
|
||
use util::hash::H256; | ||
use blockchain::block_info::{BlockInfo, BlockLocation}; | ||
|
||
/// Import route for newly inserted block. | ||
#[derive(Debug, PartialEq)] | ||
pub struct ImportRoute { | ||
/// Blocks that were invalidated by new block. | ||
pub invalidated_blocks: Vec<H256>, | ||
/// Blocks that were validted by new block. | ||
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. typo |
||
pub validated_blocks: Vec<H256>, | ||
} | ||
|
||
impl ImportRoute { | ||
pub fn none() -> Self { | ||
ImportRoute { | ||
invalidated_blocks: vec![], | ||
validated_blocks: vec![], | ||
} | ||
} | ||
} | ||
|
||
impl From<BlockInfo> for ImportRoute { | ||
fn from(info: BlockInfo) -> ImportRoute { | ||
match info.location { | ||
BlockLocation::CanonChain => ImportRoute { | ||
invalidated_blocks: vec![], | ||
validated_blocks: vec![info.hash], | ||
}, | ||
BlockLocation::Branch => ImportRoute::none(), | ||
BlockLocation::BranchBecomingCanonChain { mut route, old_route, .. } => { | ||
route.push(info.hash); | ||
ImportRoute { | ||
invalidated_blocks: old_route, | ||
validated_blocks: route, | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use util::hash::H256; | ||
use util::numbers::U256; | ||
use blockchain::block_info::{BlockInfo, BlockLocation}; | ||
use blockchain::ImportRoute; | ||
|
||
#[test] | ||
fn import_route_none() { | ||
assert_eq!(ImportRoute::none(), ImportRoute { | ||
validated_blocks: vec![], | ||
invalidated_blocks: vec![], | ||
}); | ||
} | ||
|
||
#[test] | ||
fn import_route_branch() { | ||
let info = BlockInfo { | ||
hash: H256::from(U256::from(1)), | ||
number: 0, | ||
total_difficulty: U256::from(0), | ||
location: BlockLocation::Branch, | ||
}; | ||
|
||
assert_eq!(ImportRoute::from(info), ImportRoute::none()); | ||
} | ||
|
||
#[test] | ||
fn import_route_canon_chain() { | ||
let info = BlockInfo { | ||
hash: H256::from(U256::from(1)), | ||
number: 0, | ||
total_difficulty: U256::from(0), | ||
location: BlockLocation::CanonChain, | ||
}; | ||
|
||
assert_eq!(ImportRoute::from(info), ImportRoute { | ||
invalidated_blocks: vec![], | ||
validated_blocks: vec![H256::from(U256::from(1))], | ||
}); | ||
} | ||
|
||
#[test] | ||
fn import_route_branch_becoming_canon_chain() { | ||
let info = BlockInfo { | ||
hash: H256::from(U256::from(2)), | ||
number: 0, | ||
total_difficulty: U256::from(0), | ||
location: BlockLocation::BranchBecomingCanonChain { | ||
ancestor: H256::from(U256::from(0)), | ||
route: vec![H256::from(U256::from(1))], | ||
old_route: vec![H256::from(U256::from(3)), H256::from(U256::from(4))], | ||
} | ||
}; | ||
|
||
assert_eq!(ImportRoute::from(info), ImportRoute { | ||
invalidated_blocks: vec![H256::from(U256::from(3)), H256::from(U256::from(4))], | ||
validated_blocks: vec![H256::from(U256::from(1)), H256::from(U256::from(2))], | ||
}); | ||
} | ||
} |
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.
enacted