gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-21 13:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing test for shrinking vec of structs

Browse Source
This commit is contained in:
Paul Hauner
2019-04-14 18:50:12 +10:00
parent da74c4ce74
commit 0632a00a48
4 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ where
// Get slices of the exsiting tree from the cache.
let (old_bytes, old_flags) = cache
.slices(old_offset_handler.node_range())
.slices(old_offset_handler.chunk_range())
.ok_or_else(|| Error::UnableToObtainSlices)?;
let (new_bytes, new_flags) =
@@ -137,16 +137,16 @@ where
old_flags,
old_offset_handler.height(),
offset_handler.height(),
offset_handler.total_nodes(),
offset_handler.total_chunks(),
)
.ok_or_else(|| Error::UnableToGrowMerkleTree)?
.ok_or_else(|| Error::UnableToShrinkMerkleTree)?
};
// Create a `TreeHashCache` from the raw elements.
let expanded_cache = TreeHashCache::from_elems(new_bytes, new_flags);
let modified_cache = TreeHashCache::from_elems(new_bytes, new_flags);
// Splice the newly created `TreeHashCache` over the existing, smaller elements.
cache.splice(old_offset_handler.node_range(), expanded_cache);
// Splice the newly created `TreeHashCache` over the existing elements.
cache.splice(old_offset_handler.chunk_range(), modified_cache);
}
match T::item_type() {
@@ -208,8 +208,6 @@ where
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)?)?;
}
}