Merge branch 'master' into keccak_fn

2017-08-31 11:53:26 +02:00
parent 7849fff41e e04d58f647
commit 94f717a255
55 changed files with 704 additions and 120 deletions
--- a/sync/src/blocks.rs
+++ b/sync/src/blocks.rs
@@ -18,6 +18,7 @@ use std::collections::{HashSet, HashMap};
 use std::collections::hash_map::Entry;
 use smallvec::SmallVec;
 use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use heapsize::HeapSizeOf;
 use util::*;
 use rlp::*;
 use network::NetworkError;