Don't reexport bigint from util

sync/src/api.rs

@@ -20,7 +20,8 @@ use std::io;
 use util::Bytes;
 use network::{NetworkProtocolHandler, NetworkService, NetworkContext, HostInfo, PeerId, ProtocolId,
 	NetworkConfiguration as BasicNetworkConfiguration, NonReservedPeerMode, NetworkError, ConnectionFilter};
-use util::{U256, H256, H512};
+use bigint::prelude::U256;
+use bigint::hash::{H256, H512};
 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 util::*;
+use bigint::hash::H256;
 use rlp::*;
 use ethcore::views::{BlockView};
 use ethcore::header::{BlockNumber, Header as BlockHeader};

sync/src/blocks.rs

@@ -19,6 +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 util::*;
 use rlp::*;
 use network::NetworkError;

sync/src/chain.rs

@@ -93,6 +93,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 util::*;
 use rlp::*;
 use network::*;
@@ -2230,8 +2232,9 @@ mod tests {
 	use network::PeerId;
 	use tests::helpers::*;
 	use tests::snapshot::TestSnapshotService;
-	use util::{U256, Address, RwLock};
-	use util::hash::H256;
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
+	use util::{Address, RwLock};
 	use util::bytes::Bytes;
 	use rlp::{Rlp, RlpStream, UntrustedRlp};
 	use super::*;

sync/src/lib.rs

@@ -28,6 +28,7 @@
 //!
 
 extern crate ethcore_network as network;
+extern crate ethcore_bigint as bigint;
 extern crate ethcore_io as io;
 extern crate ethcore;
 extern crate env_logger;

sync/src/light_sync/mod.rs

@@ -45,7 +45,9 @@ use light::net::{
 };
 use light::request::{self, CompleteHeadersRequest as HeadersRequest};
 use network::PeerId;
-use util::{U256, H256, Mutex, RwLock};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{Mutex, RwLock};
 use rand::{Rng, OsRng};
 
 use self::sync_round::{AbortReason, SyncRound, ResponseContext};

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 util::H256;
+use bigint::hash::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 util::H256;
+use bigint::hash::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 util::H256;
+use bigint::hash::H256;
 use std::collections::HashSet;
 use ethcore::snapshot::ManifestData;
 

sync/src/tests/consensus.rs

@@ -16,6 +16,7 @@
 
 use std::sync::Arc;
 use hash::keccak;
+use bigint::prelude::U256;
 use util::*;
 use io::{IoHandler, IoContext, IoChannel};
 use ethcore::client::{BlockChainClient, Client};

sync/src/tests/helpers.rs

@@ -16,6 +16,7 @@
 
 use std::collections::{VecDeque, HashSet, HashMap};
 use std::sync::Arc;
+use bigint::hash::H256;
 use util::*;
 use network::*;
 use tests::snapshot::*;

sync/src/tests/snapshot.rs

@@ -17,6 +17,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 use hash::keccak;
+use bigint::hash::H256;
 use util::*;
 use ethcore::snapshot::{SnapshotService, ManifestData, RestorationStatus};
 use ethcore::header::BlockNumber;

sync/src/transactions_stats.rs

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