grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into pip-msg

Browse Source
This commit is contained in:
Robert Habermeier
2017-03-21 15:23:50 +01:00
parent 8be41ad946 badb3729c9
commit fe52e969b6
91 changed files with 1118 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/light/src/net/mod.rs
View File

@@ -22,7 +22,7 @@ use ethcore::transaction::UnverifiedTransaction;
use io::TimerToken;
use network::{NetworkProtocolHandler, NetworkContext, PeerId};
use rlp::{RlpStream, Stream, UntrustedRlp, View};
use rlp::{RlpStream, UntrustedRlp, View};
use util::hash::H256;
use util::{DBValue, Mutex, RwLock, U256};
use time::{Duration, SteadyTime};
@@ -313,7 +313,7 @@ impl LightProtocol {
let req_id = ReqId(self.req_id.fetch_add(1, Ordering::SeqCst));
io.send(*peer_id, packet::REQUEST, {
let mut stream = RlpStream::new_list(2);
stream.append(&req_id.0).append(&requests.requests());
stream.append(&req_id.0).append_list(&requests.requests());
stream.out()
});
@@ -713,7 +713,7 @@ impl LightProtocol {
io.respond(packet::RESPONSE, {
let mut stream = RlpStream::new_list(3);
let cur_credits = peer.local_credits.current();
stream.append(&req_id).append(&cur_credits).append(&responses);
stream.append(&req_id).append(&cur_credits).append_list(&responses);
stream.out()
});
Ok(())