Merge branch 'master' into pip-msg

2017-03-17 14:13:10 +01:00
parent 2ee3a7282b f84fcfee04
commit 8be41ad946
306 changed files with 10353 additions and 3383 deletions
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -2175,7 +2175,7 @@ mod tests {
 	use tests::snapshot::TestSnapshotService;
 	use util::{Uint, U256, Address, RwLock};
 	use util::sha3::Hashable;
-	use util::hash::{H256, FixedHash};
+	use util::hash::H256;
 	use util::bytes::Bytes;
 	use rlp::{Rlp, RlpStream, UntrustedRlp, View, Stream};
 	use super::*;