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

Remove child_nodes method from CachedTreeHash

Browse Source
This commit is contained in:
Paul Hauner
2019-04-15 11:44:44 +10:00
parent c87a0fc588
commit e6c33e1b60
3 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
eth2/utils/tree_hash/tests/tests.rs
View File

@@ -47,26 +47,14 @@ impl CachedTreeHash<Inner> for Inner {
fn btree_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
let mut lengths = vec![];
lengths.push(self.a.num_child_nodes() + 1);
lengths.push(self.b.num_child_nodes() + 1);
lengths.push(self.c.num_child_nodes() + 1);
lengths.push(self.d.num_child_nodes() + 1);
lengths.push(BTreeOverlay::new(&self.a, 0)?.total_nodes());
lengths.push(BTreeOverlay::new(&self.b, 0)?.total_nodes());
lengths.push(BTreeOverlay::new(&self.c, 0)?.total_nodes());
lengths.push(BTreeOverlay::new(&self.d, 0)?.total_nodes());
BTreeOverlay::from_lengths(chunk_offset, lengths)
}
fn num_child_nodes(&self) -> usize {
let mut children = 0;
let leaves = 4;
children += self.a.num_child_nodes();
children += self.b.num_child_nodes();
children += self.c.num_child_nodes();
children += self.d.num_child_nodes();
num_nodes(leaves) + children - 1
}
fn packed_encoding(&self) -> Vec<u8> {
panic!("Struct should never be packed")
}
@@ -135,23 +123,12 @@ impl CachedTreeHash<Outer> for Outer {
bytes
}
fn num_child_nodes(&self) -> usize {
let mut children = 0;
let leaves = 3;
children += self.a.num_child_nodes();
children += self.b.num_child_nodes();
children += self.c.num_child_nodes();
num_nodes(leaves) + children - 1
}
fn btree_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
let mut lengths = vec![];
lengths.push(self.a.num_child_nodes() + 1);
lengths.push(self.b.num_child_nodes() + 1);
lengths.push(self.c.num_child_nodes() + 1);
lengths.push(BTreeOverlay::new(&self.a, 0)?.total_nodes());
lengths.push(BTreeOverlay::new(&self.b, 0)?.total_nodes());
lengths.push(BTreeOverlay::new(&self.c, 0)?.total_nodes());
BTreeOverlay::from_lengths(chunk_offset, lengths)
}