Merge branch 'master' into light-poa

2017-08-30 18:18:52 +02:00
parent d3c3e0b164 6b5ad69c22
commit abfa8e95a2
56 changed files with 720 additions and 134 deletions
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -42,7 +42,8 @@ use ethcore::engines::epoch::{
 };

 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use util::{H256, H256FastMap, H264, U256, HeapSizeOf, RwLock};
+use heapsize::HeapSizeOf;
+use util::{H256, H256FastMap, H264, U256,  RwLock};
 use util::kvdb::{DBTransaction, KeyValueDB};

 use cache::Cache;