Merge branch 'master' into pip-msg

2017-03-21 15:23:50 +01:00
parent 8be41ad946 badb3729c9
commit fe52e969b6
91 changed files with 1118 additions and 988 deletions
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -2177,7 +2177,7 @@ mod tests {
 	use util::sha3::Hashable;
 	use util::hash::H256;
 	use util::bytes::Bytes;
-	use rlp::{Rlp, RlpStream, UntrustedRlp, View, Stream};
+	use rlp::{Rlp, RlpStream, UntrustedRlp, View};
 	use super::*;
 	use ::SyncConfig;
 	use super::{PeerInfo, PeerAsking};