port network, sync, rpc

util/network/src/connection.rs

@@ -23,7 +23,7 @@ use mio::tcp::*;
 use util::hash::*;
 use util::sha3::*;
 use util::bytes::*;
-use util::rlp::*;
+use rlp::*;
 use std::io::{self, Cursor, Read, Write};
 use error::*;
 use io::{IoContext, StreamToken};

util/network/src/discovery.rs

@@ -24,7 +24,7 @@ use mio::udp::*;
 use util::sha3::*;
 use time;
 use util::hash::*;
-use util::rlp::*;
+use rlp::*;
 use node_table::*;
 use error::NetworkError;
 use io::{StreamToken, IoContext};

util/network/src/error.rs

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use io::IoError;
-use util::rlp::*;
+use rlp::*;
 use util::UtilError;
 use std::fmt;
 use ethkey::Error as KeyError;

util/network/src/handshake.rs

@@ -18,9 +18,9 @@ use std::sync::Arc;
 use rand::random;
 use mio::tcp::*;
 use util::hash::*;
-use util::rlp::*;
 use util::sha3::Hashable;
 use util::bytes::Bytes;
+use rlp::*;
 use connection::{Connection};
 use host::{HostInfo};
 use node_table::NodeId;

util/network/src/host.rs

@@ -29,8 +29,8 @@ use mio::*;
 use mio::tcp::*;
 use util::hash::*;
 use util::Hashable;
-use util::rlp::*;
 use util::version;
+use rlp::*;
 use session::{Session, SessionData};
 use error::*;
 use io::*;

util/network/src/lib.rs

@@ -54,9 +54,6 @@
 //! }
 //! ```
 
-
-#[macro_use]
-extern crate log;
 extern crate ethcore_io as io;
 extern crate ethcore_util as util;
 extern crate parking_lot;
@@ -72,6 +69,11 @@ extern crate libc;
 extern crate slab;
 extern crate ethkey;
 extern crate ethcrypto as crypto;
+extern crate rlp;
+
+#[macro_use]
+extern crate log;
+
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 

util/network/src/node_table.rs

@@ -26,8 +26,8 @@ use std::fmt;
 use std::fs;
 use std::io::{Read, Write};
 use util::hash::*;
-use util::rlp::*;
 use util::UtilError;
+use rlp::*;
 use time::Tm;
 use error::NetworkError;
 use discovery::{TableUpdates, NodeEntry};

util/network/src/session.rs

@@ -19,8 +19,8 @@ use std::io;
 use std::sync::*;
 use mio::*;
 use mio::tcp::*;
-use util::rlp::*;
 use util::hash::*;
+use rlp::*;
 use connection::{EncryptedConnection, Packet, Connection};
 use handshake::Handshake;
 use io::{IoContext, StreamToken};