Merge branch 'master' into new-jsonrpc

2017-03-21 09:35:50 +01:00
parent 1d87f24715 badb3729c9
commit 958a8f66a0
70 changed files with 859 additions and 848 deletions
--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -33,7 +33,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, DBValue, RwLock, Mutex, U256};
 use util::sha3::{SHA3_NULL_RLP, SHA3_EMPTY_LIST_RLP};