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/ethcore/src/verification/verification.rs
+++ b/ethcore/src/verification/verification.rs
@@ -23,6 +23,7 @@

 use std::collections::HashSet;
 use hash::keccak;
+use heapsize::HeapSizeOf;
 use util::*;
 use engines::Engine;
 use error::{BlockError, Error};