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

2016-08-05 10:53:34 +02:00
parent df29fcff1a 05bfdc508e
commit 316c9093db
67 changed files with 468 additions and 348 deletions
--- a/ethcore/src/client/client.rs
+++ b/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;