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

2
ethcore/light/src/cht.rs
View File

@@ -23,7 +23,7 @@
use ethcore::ids::BlockId;
use util::{Bytes, H256, U256, HashDB, MemoryDB};
use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
use rlp::{Stream, RlpStream, UntrustedRlp, View};
use rlp::{RlpStream, UntrustedRlp, View};
// encode a key.
macro_rules! key {

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(())

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

@@ -16,7 +16,7 @@
//! Peer status and capabilities.
use rlp::{DecoderError, RlpDecodable, RlpEncodable, RlpStream, Stream, UntrustedRlp, View};
use rlp::{DecoderError, RlpDecodable, Encodable, RlpStream, UntrustedRlp, View};
use util::{H256, U256};
use super::request_credits::FlowParams;
@@ -126,7 +126,7 @@ impl<'a> Parser<'a> {
}
// Helper for encoding a key-value pair
fn encode_pair<T: RlpEncodable>(key: Key, val: &T) -> Vec<u8> {
fn encode_pair<T: Encodable>(key: Key, val: &T) -> Vec<u8> {
let mut s = RlpStream::new_list(2);
s.append(&key.as_str()).append(val);
s.out()
@@ -374,7 +374,7 @@ mod tests {
use super::*;
use super::super::request_credits::FlowParams;
use util::{U256, H256};
use rlp::{RlpStream, Stream ,UntrustedRlp, View};
use rlp::{RlpStream, UntrustedRlp, View};
#[test]
fn full_handshake() {

12
ethcore/light/src/net/tests/mod.rs
View File

@@ -48,7 +48,7 @@ fn encode_single(request: Request) -> Requests {
// helper for making a packet out of `Requests`.
fn make_packet(req_id: usize, requests: &Requests) -> Vec<u8> {
let mut stream = RlpStream::new_list(2);
stream.append(&req_id).append(&requests.requests());
stream.append(&req_id).append_list(&requests.requests());
stream.out()
}
@@ -309,7 +309,7 @@ fn get_block_headers() {
})];
let mut stream = RlpStream::new_list(3);
stream.append(&req_id).append(&new_creds).append(&response);
stream.append(&req_id).append(&new_creds).append_list(&response);
stream.out()
};
@@ -358,7 +358,7 @@ fn get_block_bodies() {
let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
let mut response_stream = RlpStream::new_list(3);
response_stream.append(&req_id).append(&new_creds).append(&bodies);
response_stream.append(&req_id).append(&new_creds).append_list(&bodies);
response_stream.out()
};
@@ -413,7 +413,7 @@ fn get_block_receipts() {
let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
let mut response_stream = RlpStream::new_list(3);
response_stream.append(&req_id).append(&new_creds).append(&receipts);
response_stream.append(&req_id).append(&new_creds).append_list(&receipts);
response_stream.out()
};
@@ -471,7 +471,7 @@ fn get_state_proofs() {
let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests());
let mut response_stream = RlpStream::new_list(3);
response_stream.append(&req_id).append(&new_creds).append(&responses);
response_stream.append(&req_id).append(&new_creds).append_list(&responses);
response_stream.out()
};
@@ -514,7 +514,7 @@ fn get_contract_code() {
let mut response_stream = RlpStream::new_list(3);
response_stream.append(&req_id).append(&new_creds).append(&response);
response_stream.append(&req_id).append(&new_creds).append_list(&response);
response_stream.out()
};

2
ethcore/light/src/on_demand/mod.rs
View File

@@ -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};

6
ethcore/light/src/on_demand/request.rs
View File

@@ -26,7 +26,7 @@ use ethcore::receipt::Receipt;
use ethcore::state::{self, ProvedExecution};
use ethcore::transaction::SignedTransaction;
use rlp::{RlpStream, Stream, UntrustedRlp, View};
use rlp::{RlpStream, UntrustedRlp, View};
use util::{Address, Bytes, DBValue, HashDB, H256, U256};
use util::memorydb::MemoryDB;
use util::sha3::Hashable;
@@ -310,7 +310,7 @@ mod tests {
#[test]
fn check_body() {
use rlp::{RlpStream, Stream};
use rlp::RlpStream;
let header = Header::new();
let mut body_stream = RlpStream::new_list(2);
@@ -348,7 +348,7 @@ mod tests {
#[test]
fn check_state_proof() {
use rlp::{RlpStream, Stream};
use rlp::RlpStream;
let mut root = H256::default();
let mut db = MemoryDB::new();

49
ethcore/light/src/types/request/mod.rs
View File

@@ -16,7 +16,7 @@
//! Light protocol request types.
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::H256;
mod builder;
@@ -525,7 +525,7 @@ pub trait IncompleteRequest: Sized {
pub mod header {
use super::{Field, HashOrNumber, NoSuchOutput, OutputKind, Output};
use ethcore::encoded;
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
/// Potentially incomplete headers request.
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -655,7 +655,7 @@ pub mod header {
/// Request and response for header proofs.
pub mod header_proof {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::{Bytes, U256, H256};
/// Potentially incomplete header proof request.
@@ -751,10 +751,12 @@ pub mod header_proof {
impl Encodable for Response {
fn rlp_append(&self, s: &mut RlpStream) {
s.begin_list(3)
.append(&self.proof)
.append(&self.hash)
.append(&self.td);
s.begin_list(3).begin_list(self.proof.len());
for item in &self.proof {
s.append_list(&item);
}
s.append(&self.hash).append(&self.td);
}
}
}
@@ -763,7 +765,7 @@ pub mod header_proof {
pub mod block_receipts {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::receipt::Receipt;
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::H256;
/// Potentially incomplete block receipts request.
@@ -849,7 +851,7 @@ pub mod block_receipts {
impl Encodable for Response {
fn rlp_append(&self, s: &mut RlpStream) {
s.append(&self.receipts);
s.append_list(&self.receipts);
}
}
}
@@ -858,7 +860,7 @@ pub mod block_receipts {
pub mod block_body {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::encoded;
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::H256;
/// Potentially incomplete block body request.
@@ -959,7 +961,7 @@ pub mod block_body {
/// A request for an account proof.
pub mod account {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::{Bytes, U256, H256};
/// Potentially incomplete request for an account proof.
@@ -1083,9 +1085,12 @@ pub mod account {
impl Encodable for Response {
fn rlp_append(&self, s: &mut RlpStream) {
s.begin_list(5)
.append(&self.proof)
.append(&self.nonce)
s.begin_list(5).begin_list(self.proof.len());
for item in &self.proof {
s.append_list(&item);
}
s.append(&self.nonce)
.append(&self.balance)
.append(&self.code_hash)
.append(&self.storage_root);
@@ -1096,7 +1101,7 @@ pub mod account {
/// A request for a storage proof.
pub mod storage {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::{Bytes, H256};
/// Potentially incomplete request for an storage proof.
@@ -1227,9 +1232,11 @@ pub mod storage {
impl Encodable for Response {
fn rlp_append(&self, s: &mut RlpStream) {
s.begin_list(2)
.append(&self.proof)
.append(&self.value);
s.begin_list(2).begin_list(self.proof.len());
for item in &self.proof {
s.append_list(&item);
}
s.append(&self.value);
}
}
}
@@ -1237,7 +1244,7 @@ pub mod storage {
/// A request for contract code.
pub mod contract_code {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::{Bytes, H256};
/// Potentially incomplete contract code request.
@@ -1351,7 +1358,7 @@ pub mod contract_code {
pub mod execution {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::transaction::Action;
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Stream, View};
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, View};
use util::{Bytes, Address, U256, H256, DBValue};
/// Potentially incomplete execution proof request.
@@ -1722,7 +1729,7 @@ mod tests {
}).map(Request::Execution).collect();
let mut stream = RlpStream::new_list(2);
stream.append(&100usize).append(&reqs);
stream.append(&100usize).append_list(&reqs);
let out = stream.out();
let rlp = UntrustedRlp::new(&out);