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

dissolve util (#7460)

Browse Source 
* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor finished

* removed obsolete util/src/lib.rs

* removed commented out code
This commit is contained in:
Marek Kotewicz
2018-01-10 13:35:18 +01:00
committed by Svyatoslav Nikolsky
parent 4a4d64be56
commit e95b093483
395 changed files with 744 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/engines/validator_set/contract.rs
View File

@@ -18,9 +18,8 @@
/// It can also report validators for misbehaviour with two levels: `reportMalicious` and `reportBenign`.
use std::sync::Weak;
use bigint::hash::H256;
use ethereum_types::{H256, Address};
use parking_lot::RwLock;
use util::*;
use bytes::Bytes;
use futures::Future;
@@ -137,8 +136,7 @@ mod tests {
use std::sync::Arc;
use rustc_hex::FromHex;
use hash::keccak;
use bigint::hash::H520;
use util::*;
use ethereum_types::{H520, Address};
use bytes::ToPretty;
use rlp::encode;
use spec::Spec;

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

@@ -25,8 +25,7 @@ mod multi;
use std::sync::Weak;
use ids::BlockId;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use bytes::Bytes;
use ethjson::spec::ValidatorSet as ValidatorSpec;
use client::EngineClient;

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

@@ -18,9 +18,8 @@
use std::collections::BTreeMap;
use std::sync::Weak;
use bigint::hash::H256;
use ethereum_types::{H256, Address};
use parking_lot::RwLock;
use util::Address;
use bytes::Bytes;
use ids::BlockId;
use header::{BlockNumber, Header};
@@ -158,7 +157,7 @@ mod tests {
use spec::Spec;
use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
use types::ids::BlockId;
use util::*;
use ethereum_types::Address;
use super::Multi;

7
ethcore/src/engines/validator_set/safe_contract.rs
View File

@@ -21,15 +21,14 @@ use futures::Future;
use native_contracts::ValidatorSet as Provider;
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::{H160, H256};
use ethereum_types::{H160, H256, U256, Address};
use parking_lot::{Mutex, RwLock};
use util::*;
use bytes::Bytes;
use memory_cache::MemoryLruCache;
use unexpected::Mismatch;
use rlp::{UntrustedRlp, RlpStream};
use kvdb::DBValue;
use basic_types::LogBloom;
use client::EngineClient;
@@ -471,7 +470,7 @@ mod tests {
use std::sync::Arc;
use rustc_hex::FromHex;
use hash::keccak;
use util::*;
use ethereum_types::Address;
use types::ids::BlockId;
use spec::Spec;
use account_provider::AccountProvider;

5
ethcore/src/engines/validator_set/simple_list.rs
View File

@@ -17,8 +17,7 @@
/// Preconfigured validator list.
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use machine::{AuxiliaryData, Call, EthereumMachine};
use header::{BlockNumber, Header};
@@ -108,7 +107,7 @@ impl ValidatorSet for SimpleList {
#[cfg(test)]
mod tests {
use std::str::FromStr;
use util::Address;
use ethereum_types::Address;
use super::super::ValidatorSet;
use super::SimpleList;

3
ethcore/src/engines/validator_set/test.rs
View File

@@ -20,8 +20,7 @@ use std::str::FromStr;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use bytes::Bytes;
use machine::{AuxiliaryData, Call, EthereumMachine};