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

Update naming for tree_hash fns/structs/traits

Browse Source
This commit is contained in:
Paul Hauner
2019-04-16 10:47:58 +10:00
parent d311b48a9f
commit 8a1bde3e2f
8 changed files with 166 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eth2/utils/tree_hash/src/cached_tree_hash.rs
View File

@@ -32,11 +32,11 @@ pub trait CachedTreeHash<T>: CachedTreeHashSubTree<T> + Sized {
}
pub trait CachedTreeHashSubTree<Item>: TreeHash {
fn btree_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error>;
fn tree_hash_cache_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error>;
fn new_cache(&self) -> Result<TreeHashCache, Error>;
fn new_tree_hash_cache(&self) -> Result<TreeHashCache, Error>;
fn update_cache(
fn update_tree_hash_cache(
&self,
other: &Item,
cache: &mut TreeHashCache,
@@ -136,7 +136,7 @@ impl TreeHashCache {
where
T: CachedTreeHashSubTree<T>,
{
item.new_cache()
item.new_tree_hash_cache()
}
pub fn from_elems(cache: Vec<u8>, chunk_modified: Vec<bool>) -> Self {

2
eth2/utils/tree_hash/src/cached_tree_hash/btree_overlay.rs
View File

@@ -14,7 +14,7 @@ impl BTreeOverlay {
where
T: CachedTreeHashSubTree<T>,
{
item.btree_overlay(initial_offset)
item.tree_hash_cache_overlay(initial_offset)
}
pub fn from_lengths(offset: usize, mut lengths: Vec<usize>) -> Result<Self, Error> {

6
eth2/utils/tree_hash/src/cached_tree_hash/impls.rs
View File

@@ -5,18 +5,18 @@ use ssz::ssz_encode;
mod vec;
impl CachedTreeHashSubTree<u64> for u64 {
fn new_cache(&self) -> Result<TreeHashCache, Error> {
fn new_tree_hash_cache(&self) -> Result<TreeHashCache, Error> {
Ok(TreeHashCache::from_bytes(
merkleize(ssz_encode(self)),
false,
)?)
}
fn btree_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
fn tree_hash_cache_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
BTreeOverlay::from_lengths(chunk_offset, vec![1])
}
fn update_cache(
fn update_tree_hash_cache(
&self,
other: &Self,
cache: &mut TreeHashCache,

8
eth2/utils/tree_hash/src/cached_tree_hash/impls/vec.rs
View File

@@ -4,7 +4,7 @@ impl<T> CachedTreeHashSubTree<Vec<T>> for Vec<T>
where
T: CachedTreeHashSubTree<T> + TreeHash,
{
fn new_cache(&self) -> Result<TreeHashCache, Error> {
fn new_tree_hash_cache(&self) -> Result<TreeHashCache, Error> {
match T::tree_hash_type() {
TreeHashType::Basic => {
TreeHashCache::from_bytes(merkleize(get_packed_leaves(self)?), false)
@@ -20,7 +20,7 @@ where
}
}
fn btree_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
fn tree_hash_cache_overlay(&self, chunk_offset: usize) -> Result<BTreeOverlay, Error> {
let lengths = match T::tree_hash_type() {
TreeHashType::Basic => vec![1; self.len() / T::tree_hash_packing_factor()],
TreeHashType::Composite | TreeHashType::List => {
@@ -37,7 +37,7 @@ where
BTreeOverlay::from_lengths(chunk_offset, lengths)
}
fn update_cache(
fn update_tree_hash_cache(
&self,
other: &Vec<T>,
cache: &mut TreeHashCache,
@@ -104,7 +104,7 @@ where
match (other.get(i), self.get(i)) {
// The item existed in the previous list and exsits in the current list.
(Some(old), Some(new)) => {
new.update_cache(old, cache, start_chunk)?;
new.update_tree_hash_cache(old, cache, start_chunk)?;
}
// The item existed in the previous list but does not exist in this list.
//

4
eth2/utils/tree_hash/src/lib.rs
View File

@@ -5,8 +5,8 @@ pub const BYTES_PER_CHUNK: usize = 32;
pub const HASHSIZE: usize = 32;
pub const MERKLE_HASH_CHUNCK: usize = 2 * BYTES_PER_CHUNK;
pub use cached_tree_hash::CachedTreeHashSubTree;
pub use standard_tree_hash::TreeHash;
pub use cached_tree_hash::{BTreeOverlay, CachedTreeHashSubTree, Error, TreeHashCache};
pub use standard_tree_hash::{efficient_merkleize, TreeHash};
#[derive(Debug, PartialEq, Clone)]
pub enum TreeHashType {