Merge branch 'master' of github.com:ethcore/parity into move_hash

ethcore/src/block_queue.rs

@@ -20,6 +20,7 @@ use std::thread::{JoinHandle, self};
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::sync::{Condvar as SCondvar, Mutex as SMutex};
 use util::*;
+use io::*;
 use verification::*;
 use error::*;
 use engines::Engine;
@@ -27,7 +28,6 @@ use views::*;
 use header::*;
 use service::*;
 use client::BlockStatus;
-use util::panics::*;
 
 pub use types::block_queue_info::BlockQueueInfo;
 
@@ -450,6 +450,7 @@ impl Drop for BlockQueue {
 #[cfg(test)]
 mod tests {
 	use util::*;
+	use io::*;
 	use spec::*;
 	use block_queue::*;
 	use tests::helpers::*;

ethcore/src/client/client.rs

@@ -27,12 +27,11 @@ use util::{journaldb, rlp, Bytes, View, PerfTimer, Itertools, Mutex, RwLock};
 use util::journaldb::JournalDB;
 use util::rlp::{UntrustedRlp};
 use util::{U256, H256, Address, H2048, Uint};
-use util::panics::*;
-use util::io::*;
 use util::sha3::*;
 use util::kvdb::*;
 
 // other
+use io::*;
 use views::{BlockView, HeaderView, BodyView};
 use error::{ImportError, ExecutionError, CallError, BlockError, ImportResult};
 use header::BlockNumber;

ethcore/src/error.rs

@@ -17,6 +17,7 @@
 //! General error types for use in ethcore.
 
 use util::*;
+use io::*;
 use header::BlockNumber;
 use basic_types::LogBloom;
 use client::Error as ClientError;
@@ -227,8 +228,10 @@ pub enum Error {
 	PowInvalid,
 	/// Error concerning TrieDBs
 	Trie(TrieError),
-	/// Io error.
-	Io(::std::io::Error),
+	/// Io crate error.
+	Io(IoError),
+	/// Standard io error.
+	StdIo(::std::io::Error),
 	/// Snappy error.
 	Snappy(::util::snappy::InvalidInput),
 }
@@ -238,6 +241,7 @@ impl fmt::Display for Error {
 		match *self {
 			Error::Client(ref err) => f.write_fmt(format_args!("{}", err)),
 			Error::Util(ref err) => f.write_fmt(format_args!("{}", err)),
+			Error::Io(ref err) => f.write_fmt(format_args!("{}", err)),
 			Error::Block(ref err) => f.write_fmt(format_args!("{}", err)),
 			Error::Execution(ref err) => f.write_fmt(format_args!("{}", err)),
 			Error::Transaction(ref err) => f.write_fmt(format_args!("{}", err)),
@@ -247,7 +251,7 @@ impl fmt::Display for Error {
 			Error::PowHashInvalid => f.write_str("Invalid or out of date PoW hash."),
 			Error::PowInvalid => f.write_str("Invalid nonce or mishash"),
 			Error::Trie(ref err) => f.write_fmt(format_args!("{}", err)),
-			Error::Io(ref err) => f.write_fmt(format_args!("{}", err)),
+			Error::StdIo(ref err) => f.write_fmt(format_args!("{}", err)),
 			Error::Snappy(ref err) => f.write_fmt(format_args!("{}", err)),
 		}
 	}
@@ -309,7 +313,7 @@ impl From<UtilError> for Error {
 
 impl From<IoError> for Error {
 	fn from(err: IoError) -> Error {
-		Error::Util(From::from(err))
+		Error::Io(err)
 	}
 }
 
@@ -321,7 +325,7 @@ impl From<TrieError> for Error {
 
 impl From<::std::io::Error> for Error {
 	fn from(err: ::std::io::Error) -> Error {
-		Error::Io(err)
+		Error::StdIo(err)
 	}
 }
 

ethcore/src/json_tests/chain.rs

@@ -24,6 +24,7 @@ use spec::Genesis;
 use ethjson;
 use ethjson::blockchain::BlockChain;
 use miner::Miner;
+use io::IoChannel;
 
 pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 	init_log();

ethcore/src/lib.rs

@@ -77,6 +77,7 @@
 
 #[macro_use] extern crate log;
 #[macro_use] extern crate ethcore_util as util;
+extern crate ethcore_io as io;
 #[macro_use] extern crate lazy_static;
 extern crate rustc_serialize;
 #[macro_use] extern crate heapsize;

ethcore/src/miner/mod.rs

@@ -27,7 +27,6 @@
 //! extern crate ethcore_util as util;
 //! extern crate ethcore;
 //! use std::env;
-//! use util::network::{NetworkService, NetworkConfiguration};
 //! use ethcore::ethereum;
 //! use ethcore::client::{Client, ClientConfig};
 //! use ethcore::miner::{Miner, MinerService};

ethcore/src/service.rs

@@ -17,7 +17,7 @@
 //! Creates and registers client and network services.
 
 use util::*;
-use util::panics::*;
+use io::*;
 use spec::Spec;
 use error::*;
 use client::{Client, ClientConfig, ChainNotify};

ethcore/src/tests/client.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use io::IoChannel;
 use client::{BlockChainClient, MiningBlockChainClient, Client, ClientConfig, BlockID};
 use block::IsBlock;
 use tests::helpers::*;

ethcore/src/tests/helpers.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use io::*;
 use client::{self, BlockChainClient, Client, ClientConfig};
 use common::*;
 use spec::*;

ethcore/src/tests/rpc.rs

@@ -24,7 +24,7 @@ use tests::helpers::*;
 use devtools::*;
 use miner::Miner;
 use crossbeam;
-use common::IoChannel;
+use io::IoChannel;
 
 pub fn run_test_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_path: &str) {
 	let socket_path = socket_path.to_owned();