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/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -30,7 +30,7 @@ use ethcore::executed::{Executed, ExecutionError};
 use futures::{Async, Poll, Future};
 use futures::sync::oneshot::{self, Sender, Receiver};
 use network::PeerId;
-use rlp::{RlpStream, Stream};
+use rlp::RlpStream;
 use util::{Bytes, RwLock, Mutex, U256, H256};
 use util::sha3::{SHA3_NULL_RLP, SHA3_EMPTY_LIST_RLP};