2af3140a26
* Add client-traits crate Move the BlockInfo trait to new crate * New crate `machine` Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code. * Use new machine and client-traits crates in ethcore * Use new crates machine and client-traits instead of ethcore where appropriate * Fix tests * Don't re-export so many types from ethcore::client * Fixing more fallout from removing re-export * fix test * More fallout from not re-exporting types * Add some docs * cleanup * import the macro edition style * Tweak docs * Add missing import * remove unused ethabi_derive imports * Use latest ethabi-contract * Move many traits from ethcore/client/traits to client-traits crate Initial version of extracted Engine trait * Move snapshot related traits to the engine crate (eew) * Move a few snapshot related types to common_types Cleanup Executed as exported from machine crate * fix warning * Gradually introduce new engine crate: snapshot * ethcore typechecks with new engine crate * Sort out types outside ethcore * Add an EpochVerifier to ethash and use that in Engine.epoch_verifier() Cleanup * Document pub members * Sort out tests Sort out default impls for EpochVerifier * Add test-helpers feature and move EngineSigner impl to the right place * Sort out tests * Sort out tests and refactor verification types * Fix missing traits * More missing traits Fix Histogram * Fix tests and cleanup * cleanup * Put back needed logger import * Don't rexport common_types from ethcore/src/client Don't export ethcore::client::* * Remove files no longer used Use types from the engine crate Explicit exports from engine::engine * Get rid of itertools * Move a few more traits from ethcore to client-traits: BlockChainReset, ScheduleInfo, StateClient * Move ProvingBlockChainClient to client-traits * Don't re-export ForkChoice and Transition from ethcore * Address grumbles: sort imports, remove commented out code * Fix merge resolution error * Extract the Clique engine to own crate * Extract NullEngine and the block_reward module from ethcore * Extract InstantSeal engine to own crate * Extract remaining engines * Extract executive_state to own crate so it can be used by engine crates * Remove snapshot stuff from the engine crate * Put snapshot traits back in ethcore * cleanup * Remove stuff from ethcore * Don't use itertools * itertools in aura is legit-ish * More post-merge fixes * Re-export less types in client * cleanup * Update ethcore/block-reward/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/basic-authority/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/ethash/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/clique/src/lib.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * signers is already a ref * Add an EngineType enum to tighten up Engine.name() * Introduce Snapshotting enum to distinguish the type of snapshots a chain uses * Rename supports_warp to snapshot_mode * Missing import * Update ethcore/src/snapshot/consensus/mod.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * remove double-semicolons
106 lines
3.1 KiB
Rust
106 lines
3.1 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/>.
|
|
|
|
/// Used for Engine testing.
|
|
|
|
use std::str::FromStr;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
|
|
|
|
use log::trace;
|
|
use parity_util_mem::MallocSizeOf;
|
|
use common_types::{
|
|
BlockNumber,
|
|
ids::BlockId,
|
|
header::Header,
|
|
errors::EthcoreError,
|
|
engines::machine::{Call, AuxiliaryData},
|
|
};
|
|
use ethereum_types::{H256, Address};
|
|
use machine::Machine;
|
|
use parity_bytes::Bytes;
|
|
|
|
use super::{ValidatorSet, SimpleList};
|
|
|
|
/// Set used for testing with a single validator.
|
|
#[derive(MallocSizeOf, Debug)]
|
|
pub struct TestSet {
|
|
validator: SimpleList,
|
|
#[ignore_malloc_size_of = "zero sized"]
|
|
last_malicious: Arc<AtomicUsize>,
|
|
#[ignore_malloc_size_of = "zero sized"]
|
|
last_benign: Arc<AtomicUsize>,
|
|
}
|
|
|
|
impl Default for TestSet {
|
|
fn default() -> Self {
|
|
TestSet::new(
|
|
Default::default(),
|
|
Default::default(),
|
|
vec![Address::from_str("7d577a597b2742b498cb5cf0c26cdcd726d39e6e").unwrap()]
|
|
)
|
|
}
|
|
}
|
|
|
|
impl TestSet {
|
|
pub fn new(last_malicious: Arc<AtomicUsize>, last_benign: Arc<AtomicUsize>, validators: Vec<Address>) -> Self {
|
|
TestSet {
|
|
validator: SimpleList::new(validators),
|
|
last_malicious,
|
|
last_benign,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ValidatorSet for TestSet {
|
|
fn default_caller(&self, _block_id: BlockId) -> Box<Call> {
|
|
Box::new(|_, _| Err("Test set doesn't require calls.".into()))
|
|
}
|
|
|
|
fn is_epoch_end(&self, _first: bool, _chain_head: &Header) -> Option<Vec<u8>> { None }
|
|
|
|
fn signals_epoch_end(&self, _: bool, _: &Header, _: AuxiliaryData)
|
|
-> engine::EpochChange
|
|
{
|
|
engine::EpochChange::No
|
|
}
|
|
|
|
fn epoch_set(&self, _: bool, _: &Machine, _: BlockNumber, _: &[u8]) -> Result<(SimpleList, Option<H256>), EthcoreError> {
|
|
Ok((self.validator.clone(), None))
|
|
}
|
|
|
|
fn contains_with_caller(&self, bh: &H256, address: &Address, _: &Call) -> bool {
|
|
self.validator.contains(bh, address)
|
|
}
|
|
|
|
fn get_with_caller(&self, bh: &H256, nonce: usize, _: &Call) -> Address {
|
|
self.validator.get(bh, nonce)
|
|
}
|
|
|
|
fn count_with_caller(&self, _bh: &H256, _: &Call) -> usize {
|
|
1
|
|
}
|
|
|
|
fn report_malicious(&self, _validator: &Address, _set_block: BlockNumber, block: BlockNumber, _proof: Bytes) {
|
|
self.last_malicious.store(block as usize, AtomicOrdering::SeqCst)
|
|
}
|
|
|
|
fn report_benign(&self, _validator: &Address, _set_block: BlockNumber, block: BlockNumber) {
|
|
trace!(target: "engine", "test validator set recording benign misbehaviour");
|
|
self.last_benign.store(block as usize, AtomicOrdering::SeqCst)
|
|
}
|
|
}
|