dissolve util (#7460)

* 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

sync/src/api.rs

@@ -20,8 +20,7 @@ use std::io;
 use bytes::Bytes;
 use network::{NetworkProtocolHandler, NetworkService, NetworkContext, HostInfo, PeerId, ProtocolId,
 	NetworkConfiguration as BasicNetworkConfiguration, NonReservedPeerMode, Error, ErrorKind, ConnectionFilter};
-use bigint::prelude::U256;
-use bigint::hash::{H256, H512};
+use ethereum_types::{H256, H512, U256};
 use io::{TimerToken};
 use ethcore::ethstore::ethkey::Secret;
 use ethcore::client::{BlockChainClient, ChainNotify};

sync/src/block_sync.rs

@@ -21,7 +21,7 @@
 use std::collections::{HashSet, VecDeque};
 use std::cmp;
 use heapsize::HeapSizeOf;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use rlp::*;
 use ethcore::views::{BlockView};
 use ethcore::header::{BlockNumber, Header as BlockHeader};

sync/src/blocks.rs

@@ -19,7 +19,7 @@ use std::collections::hash_map::Entry;
 use smallvec::SmallVec;
 use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
 use heapsize::HeapSizeOf;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use triehash::ordered_trie_root;
 use bytes::Bytes;
 use rlp::*;

sync/src/chain.rs

@@ -92,8 +92,8 @@ use std::collections::{HashSet, HashMap};
 use std::cmp;
 use hash::keccak;
 use heapsize::HeapSizeOf;
-use bigint::prelude::U256;
-use bigint::hash::{H256, H256FastMap};
+use ethereum_types::{H256, U256};
+use plain_hasher::H256FastMap;
 use parking_lot::RwLock;
 use bytes::Bytes;
 use rlp::*;
@@ -2220,12 +2220,11 @@ fn accepts_service_transaction(client_id: &str) -> bool {
 #[cfg(test)]
 mod tests {
 	use std::collections::{HashSet, VecDeque};
-	use {ethkey, Address};
+	use ethkey;
 	use network::PeerId;
 	use tests::helpers::*;
 	use tests::snapshot::TestSnapshotService;
-	use bigint::prelude::U256;
-	use bigint::hash::H256;
+	use ethereum_types::{H256, U256, Address};
 	use parking_lot::RwLock;
 	use bytes::Bytes;
 	use rlp::{Rlp, RlpStream, UntrustedRlp};

sync/src/lib.rs

@@ -22,12 +22,13 @@
 //!
 
 extern crate ethcore_network as network;
-extern crate ethcore_bigint as bigint;
 extern crate ethcore_bytes as bytes;
 extern crate ethcore_io as io;
 extern crate ethcore;
+extern crate ethereum_types;
 extern crate env_logger;
 extern crate time;
+extern crate plain_hasher;
 extern crate rand;
 extern crate semver;
 extern crate parking_lot;
@@ -67,6 +68,3 @@ mod api;
 pub use api::*;
 pub use chain::{SyncStatus, SyncState};
 pub use network::{validate_node_url, NonReservedPeerMode, Error, ErrorKind, ConnectionFilter, ConnectionDirection};
-
-#[cfg(test)]
-pub(crate) type Address = bigint::hash::H160;

sync/src/light_sync/mod.rs

@@ -45,8 +45,7 @@ use light::net::{
 };
 use light::request::{self, CompleteHeadersRequest as HeadersRequest};
 use network::PeerId;
-use bigint::prelude::U256;
-use bigint::hash::H256;
+use ethereum_types::{H256, U256};
 use parking_lot::{Mutex, RwLock};
 use rand::{Rng, OsRng};
 

sync/src/light_sync/response.rs

@@ -22,7 +22,7 @@ use ethcore::encoded;
 use ethcore::header::Header;
 use light::request::{HashOrNumber, CompleteHeadersRequest as HeadersRequest};
 use rlp::DecoderError;
-use bigint::hash::H256;
+use ethereum_types::H256;
 
 /// Errors found when decoding headers and verifying with basic constraints.
 #[derive(Debug, PartialEq)]

sync/src/light_sync/sync_round.rs

@@ -27,7 +27,7 @@ use light::net::ReqId;
 use light::request::CompleteHeadersRequest as HeadersRequest;
 
 use network::PeerId;
-use bigint::hash::H256;
+use ethereum_types::H256;
 
 use super::response;
 

sync/src/snapshot.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use hash::keccak;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use std::collections::HashSet;
 use ethcore::snapshot::ManifestData;
 

sync/src/tests/consensus.rs

@@ -16,7 +16,7 @@
 
 use std::sync::Arc;
 use hash::keccak;
-use bigint::prelude::U256;
+use ethereum_types::{U256, Address};
 use io::{IoHandler, IoContext, IoChannel};
 use ethcore::client::{BlockChainClient, Client};
 use ethcore::service::ClientIoMessage;
@@ -26,7 +26,7 @@ use ethcore::transaction::*;
 use ethcore::account_provider::AccountProvider;
 use ethkey::{KeyPair, Secret};
 use super::helpers::*;
-use {SyncConfig, Address};
+use SyncConfig;
 
 struct TestIoHandler {
 	client: Arc<Client>,

sync/src/tests/helpers.rs

@@ -16,7 +16,7 @@
 
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use parking_lot::RwLock;
 use bytes::Bytes;
 use network::{self, PeerId, ProtocolId, PacketId, SessionInfo};

sync/src/tests/snapshot.rs

@@ -17,7 +17,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 use hash::keccak;
-use bigint::hash::H256;
+use ethereum_types::H256;
 use parking_lot::Mutex;
 use bytes::Bytes;
 use ethcore::snapshot::{SnapshotService, ManifestData, RestorationStatus};

sync/src/transactions_stats.rs

@@ -16,7 +16,8 @@
 
 use api::TransactionStats;
 use std::collections::{HashSet, HashMap};
-use bigint::hash::{H256, H512, H256FastMap};
+use ethereum_types::{H256, H512};
+use plain_hasher::H256FastMap;
 
 type NodeId = H512;
 type BlockNumber = u64;