* version: bump beta to 2.2.2 * Add experimental RPCs flag (#9928) * WiP * Enable experimental RPCs. * Keep existing blocks when restoring a Snapshot (#8643) * Rename db_restore => client * First step: make it compile! * Second step: working implementation! * Refactoring * Fix tests * PR Grumbles * PR Grumbles WIP * Migrate ancient blocks interating backward * Early return in block migration if snapshot is aborted * Remove RwLock getter (PR Grumble I) * Remove dependency on `Client`: only used Traits * Add test for recovering aborted snapshot recovery * Add test for migrating old blocks * Fix build * PR Grumble I * PR Grumble II * PR Grumble III * PR Grumble IV * PR Grumble V * PR Grumble VI * Fix one test * Fix test * PR Grumble * PR Grumbles * PR Grumbles II * Fix tests * Release RwLock earlier * Revert Cargo.lock * Update _update ancient block_ logic: set local in `commit` * Update typo in ethcore/src/snapshot/service.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * Adjust requests costs for light client (#9925) * PIP Table Cost relative to average peers instead of max peers * Add tracing in PIP new_cost_table * Update stat peer_count * Use number of leeching peers for Light serve costs * Fix test::light_params_load_share_depends_on_max_peers (wrong type) * Remove (now) useless test * Remove `load_share` from LightParams.Config Prevent div. by 0 * Add LEECHER_COUNT_FACTOR * PR Grumble: u64 to u32 for f64 casting * Prevent u32 overflow for avg_peer_count * Add tests for LightSync::Statistics * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * prevent silent errors in daemon mode, closes #9367 (#9946) * Fix a deadlock (#9952) * Update informant: - decimal in Mgas/s - print every 5s (not randomly between 5s and 10s) * Fix dead-lock in `blockchain.rs` * Update locks ordering * Fix light client informant while syncing (#9932) * Add `is_idle` to LightSync to check importing status * Use SyncStateWrapper to make sure is_idle gets updates * Update is_major_import to use verified queue size as well * Add comment for `is_idle` * Add Debug to `SyncStateWrapper` * `fn get` -> `fn into_inner` * ci: rearrange pipeline by logic (#9970) * ci: rearrange pipeline by logic * ci: rename docs script * fix docker build (#9971) * Deny unknown fields for chainspec (#9972) * Add deny_unknown_fields to chainspec * Add tests and fix existing one * Remove serde_ignored dependency for chainspec * Fix rpc test eth chain spec * Fix starting_nonce_test spec * Improve block and transaction propagation (#9954) * Refactor sync to add priority tasks. * Send priority tasks notifications. * Propagate blocks, optimize transactions. * Implement transaction propagation. Use sync_channel. * Tone down info. * Prevent deadlock by not waiting forever for sync lock. * Fix lock order. * Don't use sync_channel to prevent deadlocks. * Fix tests. * Fix unstable peers and slowness in sync (#9967) * Don't sync all peers after each response * Update formating * Fix tests: add `continue_sync` to `Sync_step` * Update ethcore/sync/src/chain/mod.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * fix rpc middlewares * fix Cargo.lock * json: resolve merge in spec * rpc: fix starting_nonce_test * ci: allow nightl job to fail
82 lines
2.8 KiB
Rust
82 lines
2.8 KiB
Rust
// Copyright 2015-2018 Parity Technologies (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/>.
|
|
|
|
//! Validator set deserialization.
|
|
|
|
use std::collections::BTreeMap;
|
|
use uint::Uint;
|
|
use hash::Address;
|
|
|
|
/// Different ways of specifying validators.
|
|
#[derive(Debug, PartialEq, Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
pub enum ValidatorSet {
|
|
/// A simple list of authorities.
|
|
#[serde(rename="list")]
|
|
List(Vec<Address>),
|
|
/// Address of a contract that indicates the list of authorities.
|
|
#[serde(rename="safeContract")]
|
|
SafeContract(Address),
|
|
/// Address of a contract that indicates the list of authorities and enables reporting of theor misbehaviour using transactions.
|
|
#[serde(rename="contract")]
|
|
Contract(Address),
|
|
/// A map of starting blocks for each validator set.
|
|
#[serde(rename="multi")]
|
|
Multi(BTreeMap<Uint, ValidatorSet>),
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use serde_json;
|
|
use uint::Uint;
|
|
use ethereum_types::{H160, U256};
|
|
use hash::Address;
|
|
use spec::validator_set::ValidatorSet;
|
|
|
|
#[test]
|
|
fn validator_set_deserialization() {
|
|
let s = r#"[{
|
|
"list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"]
|
|
}, {
|
|
"safeContract": "0xc6d9d2cd449a754c494264e1809c50e34d64562b"
|
|
}, {
|
|
"contract": "0xc6d9d2cd449a754c494264e1809c50e34d64562b"
|
|
}, {
|
|
"multi": {
|
|
"0": { "list": ["0xc6d9d2cd449a754c494264e1809c50e34d64562b"] },
|
|
"10": { "list": ["0xd6d9d2cd449a754c494264e1809c50e34d64562b"] },
|
|
"20": { "contract": "0xc6d9d2cd449a754c494264e1809c50e34d64562b" }
|
|
}
|
|
}]"#;
|
|
|
|
let deserialized: Vec<ValidatorSet> = serde_json::from_str(s).unwrap();
|
|
assert_eq!(deserialized.len(), 4);
|
|
|
|
assert_eq!(deserialized[0], ValidatorSet::List(vec![Address(H160::from("0xc6d9d2cd449a754c494264e1809c50e34d64562b"))]));
|
|
assert_eq!(deserialized[1], ValidatorSet::SafeContract(Address(H160::from("0xc6d9d2cd449a754c494264e1809c50e34d64562b"))));
|
|
assert_eq!(deserialized[2], ValidatorSet::Contract(Address(H160::from("0xc6d9d2cd449a754c494264e1809c50e34d64562b"))));
|
|
match deserialized[3] {
|
|
ValidatorSet::Multi(ref map) => {
|
|
assert_eq!(map.len(), 3);
|
|
assert!(map.contains_key(&Uint(U256::from(0))));
|
|
assert!(map.contains_key(&Uint(U256::from(10))));
|
|
assert!(map.contains_key(&Uint(U256::from(20))));
|
|
},
|
|
_ => assert!(false),
|
|
}
|
|
}
|
|
}
|