From 2dcf1c857c893319464a5004240f22f9bf250582 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Thu, 28 Mar 2019 23:21:24 +1100 Subject: [PATCH] Fix failing cache hashing test --- eth2/utils/ssz/src/cached_tree_hash.rs | 2 -- eth2/utils/ssz/src/cached_tree_hash/tests.rs | 14 ++------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/eth2/utils/ssz/src/cached_tree_hash.rs b/eth2/utils/ssz/src/cached_tree_hash.rs index 75598f0b2..bf2e4b389 100644 --- a/eth2/utils/ssz/src/cached_tree_hash.rs +++ b/eth2/utils/ssz/src/cached_tree_hash.rs @@ -85,8 +85,6 @@ impl TreeHashCache { } pub fn either_modified(&self, children: (&usize, &usize)) -> Option { - dbg!(&self.chunk_modified.len()); - dbg!(&self.cache.len() / BYTES_PER_CHUNK); Some(self.changed(*children.0)? | self.changed(*children.1)?) } diff --git a/eth2/utils/ssz/src/cached_tree_hash/tests.rs b/eth2/utils/ssz/src/cached_tree_hash/tests.rs index 791bc17b6..13e8ef556 100644 --- a/eth2/utils/ssz/src/cached_tree_hash/tests.rs +++ b/eth2/utils/ssz/src/cached_tree_hash/tests.rs @@ -174,8 +174,6 @@ impl CachedTreeHash for Outer { for (&parent, children) in offset_handler.iter_internal_nodes().rev() { if cache.either_modified(children)? { - dbg!(parent); - dbg!(children); cache.modify_chunk(parent, &cache.hash_children(children)?)?; } } @@ -234,7 +232,7 @@ fn partial_modification_to_outer() { let leaves = vec![ int_to_bytes32(0), inner_bytes[0..32].to_vec(), - int_to_bytes32(5), + int_to_bytes32(42), vec![0; 32], // padding ]; let mut merkle = merkleize(join(leaves)); @@ -282,15 +280,7 @@ fn outer_builds() { assert_eq!(merkle.len() / HASHSIZE, 13); assert_eq!(cache.len() / HASHSIZE, 13); - for (i, chunk) in cache.chunks(HASHSIZE).enumerate() { - assert_eq!( - merkle[i * HASHSIZE..(i + 1) * HASHSIZE], - *chunk, - "failed on {}", - i - ); - } - // assert_eq!(merkle, cache); + assert_eq!(merkle, cache); } /*