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

Add new build method for cached hashes

Browse Source
This commit is contained in:
Paul Hauner
2019-03-29 00:47:42 +11:00
parent 40bfd5a6c7
commit 7b05c506df
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,28 +13,18 @@ impl CachedTreeHash for Inner {
type Item = Self;
fn build_cache_bytes(&self) -> Vec<u8> {
let cache_a = self.a.build_cache_bytes();
let cache_b = self.b.build_cache_bytes();
let cache_c = self.c.build_cache_bytes();
let cache_d = self.d.build_cache_bytes();
let mut leaves_and_subtrees = vec![];
let mut leaves = vec![];
leaves.extend_from_slice(&cache_a[0..32].to_vec());
leaves.extend_from_slice(&cache_b[0..32].to_vec());
leaves.extend_from_slice(&cache_c[0..32].to_vec());
leaves.extend_from_slice(&cache_d[0..32].to_vec());
// TODO: fix unwrap
let mut cache = TreeHashCache::from_bytes(merkleize(leaves)).unwrap();
leaves_and_subtrees.append(&mut self.a.build_cache_bytes());
leaves_and_subtrees.append(&mut self.b.build_cache_bytes());
leaves_and_subtrees.append(&mut self.c.build_cache_bytes());
leaves_and_subtrees.append(&mut self.d.build_cache_bytes());
// TODO: fix unwrap
let offset_handler = self.offset_handler(0).unwrap();
let mut iter = offset_handler.iter_leaf_nodes();
cache.single_chunk_splice(*iter.next().unwrap(), cache_a);
cache.single_chunk_splice(*iter.next().unwrap(), cache_b);
cache.single_chunk_splice(*iter.next().unwrap(), cache_c);
cache.single_chunk_splice(*iter.next().unwrap(), cache_d);
// TODO: fix unwrap
let cache = TreeHashCache::new(leaves_and_subtrees, offset_handler).unwrap();
cache.into()
}
@@ -111,25 +101,17 @@ impl CachedTreeHash for Outer {
type Item = Self;
fn build_cache_bytes(&self) -> Vec<u8> {
let cache_a = self.a.build_cache_bytes();
let cache_b = self.b.build_cache_bytes();
let cache_c = self.c.build_cache_bytes();
let mut leaves_and_subtrees = vec![];
let mut leaves = vec![];
leaves.extend_from_slice(&cache_a[0..32].to_vec());
leaves.extend_from_slice(&cache_b[0..32].to_vec());
leaves.extend_from_slice(&cache_c[0..32].to_vec());
// TODO: fix unwrap
let mut cache = TreeHashCache::from_bytes(merkleize(leaves)).unwrap();
leaves_and_subtrees.append(&mut self.a.build_cache_bytes());
leaves_and_subtrees.append(&mut self.b.build_cache_bytes());
leaves_and_subtrees.append(&mut self.c.build_cache_bytes());
// TODO: fix unwrap
let offset_handler = self.offset_handler(0).unwrap();
let mut iter = offset_handler.iter_leaf_nodes();
cache.single_chunk_splice(*iter.next().unwrap(), cache_a);
cache.single_chunk_splice(*iter.next().unwrap(), cache_b);
cache.single_chunk_splice(*iter.next().unwrap(), cache_c);
// TODO: fix unwrap
let cache = TreeHashCache::new(leaves_and_subtrees, offset_handler).unwrap();
cache.into()
}