grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine changes

Browse Source
This commit is contained in:
Robert Habermeier
2017-04-12 14:41:19 +02:00
parent 7723d6281b
commit 2d8a8bd3e5
10 changed files with 43 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ethcore/src/engines/validator_set/mod.rs
View File

@@ -25,15 +25,12 @@ use std::sync::Weak;
use util::{Address, H256};
use ethjson::spec::ValidatorSet as ValidatorSpec;
use client::Client;
use receipt::Receipt;
use self::simple_list::SimpleList;
use self::contract::ValidatorContract;
use self::safe_contract::ValidatorSafeContract;
use self::multi::Multi;
pub type Call = Fn(Address, Vec<u8>) -> Result<Vec<u8>, String>;
/// Creates a validator set from spec.
pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
match spec {
@@ -48,10 +45,6 @@ pub fn new_validator_set(spec: ValidatorSpec) -> Box<ValidatorSet> {
/// A validator set.
pub trait ValidatorSet: Send + Sync {
/// Get this validator set as a flexible validator set.
/// Returning `None` indicates this is only usable for
/// full nodes.
fn as_memoized(&self) -> Option<&Memoized> { None }
/// Checks if a given address is a validator.
fn contains(&self, parent_block_hash: &H256, address: &Address) -> bool;
/// Draws an validator nonce modulo number of validators.
@@ -65,35 +58,3 @@ pub trait ValidatorSet: Send + Sync {
/// Allows blockchain state access.
fn register_contract(&self, _client: Weak<Client>) {}
}
/// A flexible validator set can track its changes.
pub trait FlexibleValidatorSet: Send + Sync {
/// Whether a validator set may have changed at this header.
fn has_possibly_changed(&self, header: &Header) -> bool;
/// Whether a validator set has changed at this header, given the block receipts.
/// Called after `has_possibly_changed`.
/// `Some` indicates the validator set has changed at this header and the new
/// expected validator set.
/// `None` indicates no change.
fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<SimpleList>;
/// Fetch validators at a block synchronously.
fn fetch_validators(&self, header: &Header, call: &Call) -> Result<SimpleList, String>;
}
/// A memoized flexible validator set
pub struct Memoized {
inner: Box<FlexibleValidatorSet>,
memo: Mutex<(SimpleList, (H256, u64))>,
}
impl Memoized {
/// Denote that the
pub fn use_memo_at(&self, list: SimpleList)
}
impl ValidatorSet for Memoized {
fn as_memoized(&self) -> Option<&Memoized> { Some(self) }
}

17
ethcore/src/engines/validator_set/multi.rs
View File

@@ -55,7 +55,7 @@ impl Multi {
) {
Ok((block, set)) => {
trace!(target: "engine", "Multi ValidatorSet retrieved for block {}.", block);
Some(&*set)
Some(&**set)
},
Err(e) => {
debug!(target: "engine", "ValidatorSet could not be recovered: {}", e);
@@ -66,21 +66,6 @@ impl Multi {
}
impl ValidatorSet for Multi {
fn has_possibly_changed(&self, header: &Header) -> bool {
// if the sets are the same for each header, compare those.
// otherwise, the sets have almost certainly changed.
match (self.correct_set(&header.hash()), self.correct_set(header.parent_hash())) {
(Some(a), Some(b)) if a as *const _ == b as *const _ => { a.has_possibly_changed(header) },
_ => true,
}
}
fn has_changed(&self, header: &Header, receipts: &[Receipt]) -> Option<Vec<Address>> {
}
fn fetch(&self) ->
fn contains(&self, bh: &H256, address: &Address) -> bool {
self.correct_set(bh).map_or(false, |set| set.contains(bh, address))
}