cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix failing cache hashing test

Browse Source
This commit is contained in:
Paul Hauner 2019-03-28 23:21:24 +11:00
parent 49639c40ee
commit 2dcf1c857c
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth2/utils/ssz/src/cached_tree_hash.rs
View File

@ -85,8 +85,6 @@ impl TreeHashCache {
} }
pub fn either_modified(&self, children: (&usize, &usize)) -> Option<bool> { pub fn either_modified(&self, children: (&usize, &usize)) -> Option<bool> {
dbg!(&self.chunk_modified.len());
dbg!(&self.cache.len() / BYTES_PER_CHUNK);
Some(self.changed(*children.0)? | self.changed(*children.1)?) Some(self.changed(*children.0)? | self.changed(*children.1)?)
} }

14
eth2/utils/ssz/src/cached_tree_hash/tests.rs
View File

@ -174,8 +174,6 @@ impl CachedTreeHash for Outer {
for (&parent, children) in offset_handler.iter_internal_nodes().rev() { for (&parent, children) in offset_handler.iter_internal_nodes().rev() {
if cache.either_modified(children)? { if cache.either_modified(children)? {
dbg!(parent);
dbg!(children);
cache.modify_chunk(parent, &cache.hash_children(children)?)?; cache.modify_chunk(parent, &cache.hash_children(children)?)?;
} }
} }
@ -234,7 +232,7 @@ fn partial_modification_to_outer() {
let leaves = vec![ let leaves = vec![
int_to_bytes32(0), int_to_bytes32(0),
inner_bytes[0..32].to_vec(), inner_bytes[0..32].to_vec(),
int_to_bytes32(5), int_to_bytes32(42),
vec![0; 32], // padding vec![0; 32], // padding
]; ];
let mut merkle = merkleize(join(leaves)); let mut merkle = merkleize(join(leaves));
@ -282,15 +280,7 @@ fn outer_builds() {
assert_eq!(merkle.len() / HASHSIZE, 13); assert_eq!(merkle.len() / HASHSIZE, 13);
assert_eq!(cache.len() / HASHSIZE, 13); assert_eq!(cache.len() / HASHSIZE, 13);
for (i, chunk) in cache.chunks(HASHSIZE).enumerate() { assert_eq!(merkle, cache);
assert_eq!(
merkle[i * HASHSIZE..(i + 1) * HASHSIZE],
*chunk,
"failed on {}",
i
);
}
// assert_eq!(merkle, cache);
} }
/* /*