Merge branch 'fo-6418-dont-export-bigint' of github.com:paritytech/parity into util_error_chain

util/network/src/connection.rs

@@ -22,7 +22,7 @@ use hash::{keccak, write_keccak};
 use mio::{Token, Ready, PollOpt};
 use mio::deprecated::{Handler, EventLoop, TryRead, TryWrite};
 use mio::tcp::*;
-use util::hash::*;
+use bigint::hash::*;
 use util::bytes::*;
 use rlp::*;
 use std::io::{self, Cursor, Read, Write};
@@ -481,7 +481,7 @@ impl EncryptedConnection {
 
 #[test]
 pub fn test_encryption() {
-	use util::hash::*;
+	use bigint::hash::*;
 	use std::str::FromStr;
 	let key = H256::from_str("2212767d793a7a3d66f869ae324dd11bd17044b82c9f463b8a541a4d089efec5").unwrap();
 	let before = H128::from_str("12532abaec065082a3cf1da7d0136f15").unwrap();

util/network/src/discovery.rs

@@ -24,7 +24,7 @@ use mio::deprecated::{Handler, EventLoop};
 use mio::udp::*;
 use hash::keccak;
 use time;
-use util::hash::*;
+use bigint::hash::*;
 use rlp::*;
 use node_table::*;
 use error::NetworkError;

util/network/src/handshake.rs

@@ -18,7 +18,7 @@ use std::sync::Arc;
 use rand::random;
 use hash::write_keccak;
 use mio::tcp::*;
-use util::hash::*;
+use bigint::hash::*;
 use util::bytes::Bytes;
 use rlp::*;
 use connection::{Connection};
@@ -333,7 +333,7 @@ mod test {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
 	use super::*;
-	use util::hash::H256;
+	use bigint::hash::H256;
 	use io::*;
 	use mio::tcp::TcpStream;
 	use stats::NetworkStats;

util/network/src/host.rs

@@ -29,7 +29,7 @@ use hash::keccak;
 use mio::*;
 use mio::deprecated::{EventLoop};
 use mio::tcp::*;
-use util::hash::*;
+use bigint::hash::*;
 use util::version;
 use rlp::*;
 use session::{Session, SessionInfo, SessionData};

util/network/src/lib.rs

@@ -59,6 +59,7 @@
 
 extern crate ethcore_io as io;
 extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate parking_lot;
 extern crate mio;
 extern crate tiny_keccak;

util/network/src/node_table.rs

@@ -25,7 +25,7 @@ use std::path::{PathBuf};
 use std::fmt;
 use std::fs;
 use std::io::{Read, Write};
-use util::hash::*;
+use bigint::hash::*;
 use rlp::*;
 use time::Tm;
 use error::NetworkError;
@@ -372,7 +372,7 @@ pub fn is_valid_node_url(url: &str) -> bool {
 mod tests {
 	use super::*;
 	use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
-	use util::H512;
+	use bigint::hash::H512;
 	use std::str::FromStr;
 	use devtools::*;
 	use ipnetwork::IpNetwork;

util/network/src/session.rs

@@ -23,7 +23,7 @@ use std::collections::HashMap;
 use mio::*;
 use mio::deprecated::{Handler, EventLoop};
 use mio::tcp::*;
-use util::hash::*;
+use bigint::hash::*;
 use rlp::*;
 use connection::{EncryptedConnection, Packet, Connection};
 use handshake::Handshake;