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/encoded.rs
+++ b/ethcore/src/encoded.rs
@@ -28,8 +28,9 @@ use header::{BlockNumber, Header as FullHeader};
 use transaction::UnverifiedTransaction;
 use views;

-use util::{Address, H256, H2048, U256, HeapSizeOf};
 use hash::keccak;
+use heapsize::HeapSizeOf;
+use util::{Address, H256, H2048, U256};
 use rlp::Rlp;

 /// Owning header view.