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/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -374,7 +374,7 @@ impl<T: ChainDataFetcher> Client<T> {

 	/// Get blockchain mem usage in bytes.
 	pub fn chain_mem_used(&self) -> usize {
-		use util::HeapSizeOf;
+		use heapsize::HeapSizeOf;

 		self.chain.heap_size_of_children()
 	}