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

Add TreeHash trait to all types and structs

Browse Source
This commit is contained in:
Kirk Baird
2019-01-25 12:22:56 +11:00
parent 407bf5e06d
commit 9c9b07c182
31 changed files with 642 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eth2/utils/ssz/src/impl_tree_hash.rs
View File

@@ -1,5 +1,5 @@
use super::ethereum_types::{Address, H256};
use super::{merkle_hash, ssz_encode, TreeHash};
use super::{hash, merkle_hash, ssz_encode, TreeHash};
impl TreeHash for u8 {
fn hash_tree_root(&self) -> Vec<u8> {
@@ -25,6 +25,12 @@ impl TreeHash for u64 {
}
}
impl TreeHash for usize {
fn hash_tree_root(&self) -> Vec<u8> {
ssz_encode(self)
}
}
impl TreeHash for Address {
fn hash_tree_root(&self) -> Vec<u8> {
ssz_encode(self)
@@ -37,6 +43,15 @@ impl TreeHash for H256 {
}
}
impl TreeHash for [u8] {
fn hash_tree_root(&self) -> Vec<u8> {
if self.len() > 32 {
return hash(&self);
}
self.to_vec()
}
}
impl<T> TreeHash for Vec<T>
where
T: TreeHash,

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

@@ -23,7 +23,7 @@ pub fn merkle_hash(list: &mut Vec<Vec<u8>>) -> Vec<u8> {
}
mhash.append(&mut datalen.to_vec());
hash(mhash.as_slice())
hash(&mhash)
}
/// Takes a flat vector of bytes. It then hashes 'chunk_size * 2' slices into
@@ -36,7 +36,7 @@ fn hash_level(data: &mut Vec<u8>, chunk_size: usize) -> Vec<u8> {
// SSZ_CHUNK_SIZE vector
let mut c = two_chunks.to_vec();
c.append(&mut vec![0; SSZ_CHUNK_SIZE]);
result.append(&mut hash(c.as_slice()));
result.append(&mut hash(&c));
} else {
// Hash two chuncks together
result.append(&mut hash(two_chunks));