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

Merge branch 'pip-msg' into lightcli

Browse Source
This commit is contained in:
Robert Habermeier
2017-03-22 22:08:39 +01:00
parent 83911a7290 a0619fc101
commit 0abbd7ac97
148 changed files with 1267 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ethcore/light/src/client/header_chain.rs
View File

@@ -35,7 +35,7 @@ use ethcore::encoded;
use ethcore::header::Header;
use ethcore::ids::BlockId;
use rlp::{Encodable, Decodable, Decoder, DecoderError, RlpStream, Rlp, View};
use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
use util::{H256, U256, HeapSizeOf, RwLock};
use util::kvdb::{DBTransaction, KeyValueDB};
@@ -95,8 +95,7 @@ impl Encodable for Entry {
}
impl Decodable for Entry {
fn decode<D: Decoder>(decoder: &D) -> Result<Self, DecoderError> {
let rlp = decoder.as_rlp();
fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
let mut candidates = SmallVec::<[Candidate; 3]>::new();