dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
136 lines
3.7 KiB
Rust
136 lines
3.7 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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 Ethereum 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 Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Import route.
|
|
|
|
use ethereum_types::H256;
|
|
use crate::block_info::{BlockInfo, BlockLocation};
|
|
|
|
/// Import route for newly inserted block.
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub struct ImportRoute {
|
|
/// Blocks that were invalidated by new block.
|
|
pub retracted: Vec<H256>,
|
|
/// Blocks that were validated by new block.
|
|
pub enacted: Vec<H256>,
|
|
/// Blocks which are neither retracted nor enacted.
|
|
pub omitted: Vec<H256>,
|
|
}
|
|
|
|
impl ImportRoute {
|
|
/// Empty import route.
|
|
pub fn none() -> Self {
|
|
ImportRoute {
|
|
retracted: vec![],
|
|
enacted: vec![],
|
|
omitted: vec![],
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<BlockInfo> for ImportRoute {
|
|
fn from(info: BlockInfo) -> ImportRoute {
|
|
match info.location {
|
|
BlockLocation::CanonChain => ImportRoute {
|
|
retracted: vec![],
|
|
enacted: vec![info.hash],
|
|
omitted: vec![],
|
|
},
|
|
BlockLocation::Branch => ImportRoute {
|
|
retracted: vec![],
|
|
enacted: vec![],
|
|
omitted: vec![info.hash],
|
|
},
|
|
BlockLocation::BranchBecomingCanonChain(mut data) => {
|
|
data.enacted.push(info.hash);
|
|
ImportRoute {
|
|
retracted: data.retracted,
|
|
enacted: data.enacted,
|
|
omitted: vec![],
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use ethereum_types::{U256, BigEndianHash};
|
|
use crate::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
|
|
use super::ImportRoute;
|
|
|
|
#[test]
|
|
fn import_route_none() {
|
|
assert_eq!(ImportRoute::none(), ImportRoute {
|
|
enacted: vec![],
|
|
retracted: vec![],
|
|
omitted: vec![],
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn import_route_branch() {
|
|
let info = BlockInfo {
|
|
hash: BigEndianHash::from_uint(&U256::from(1)),
|
|
number: 0,
|
|
total_difficulty: U256::from(0),
|
|
location: BlockLocation::Branch,
|
|
};
|
|
|
|
assert_eq!(ImportRoute::from(info), ImportRoute {
|
|
retracted: vec![],
|
|
enacted: vec![],
|
|
omitted: vec![BigEndianHash::from_uint(&U256::from(1))],
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn import_route_canon_chain() {
|
|
let info = BlockInfo {
|
|
hash: BigEndianHash::from_uint(&U256::from(1)),
|
|
number: 0,
|
|
total_difficulty: U256::from(0),
|
|
location: BlockLocation::CanonChain,
|
|
};
|
|
|
|
assert_eq!(ImportRoute::from(info), ImportRoute {
|
|
retracted: vec![],
|
|
enacted: vec![BigEndianHash::from_uint(&U256::from(1))],
|
|
omitted: vec![],
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn import_route_branch_becoming_canon_chain() {
|
|
let info = BlockInfo {
|
|
hash: BigEndianHash::from_uint(&U256::from(2)),
|
|
number: 0,
|
|
total_difficulty: U256::from(0),
|
|
location: BlockLocation::BranchBecomingCanonChain(BranchBecomingCanonChainData {
|
|
ancestor: BigEndianHash::from_uint(&U256::from(0)),
|
|
enacted: vec![BigEndianHash::from_uint(&U256::from(1))],
|
|
retracted: vec![BigEndianHash::from_uint(&U256::from(3)), BigEndianHash::from_uint(&U256::from(4))],
|
|
})
|
|
};
|
|
|
|
assert_eq!(ImportRoute::from(info), ImportRoute {
|
|
retracted: vec![BigEndianHash::from_uint(&U256::from(3)), BigEndianHash::from_uint(&U256::from(4))],
|
|
enacted: vec![BigEndianHash::from_uint(&U256::from(1)), BigEndianHash::from_uint(&U256::from(2))],
|
|
omitted: vec![],
|
|
});
|
|
}
|
|
}
|