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

Further tidy tree_hash crate.

Browse Source
This commit is contained in:
Paul Hauner
2019-04-26 10:37:50 +10:00
parent 461f3d2382
commit f1d8224d89
5 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ pub fn tree_hash_derive(input: TokenStream) -> TokenStream {
leaves.append(&mut self.#idents.tree_hash_root());
)*
tree_hash::merkle_root(&leaves)
tree_hash::merkleize::merkle_root(&leaves)
}
}
};
@@ -179,7 +179,7 @@ pub fn tree_hash_signed_root_derive(input: TokenStream) -> TokenStream {
leaves.append(&mut self.#idents.tree_hash_root());
)*
tree_hash::merkle_root(&leaves)
tree_hash::merkleize::merkle_root(&leaves)
}
}
};

8
eth2/utils/tree_hash_derive/tests/tests.rs
View File

@@ -1,5 +1,5 @@
use cached_tree_hash::{CachedTreeHash, CachedTreeHasher};
use tree_hash::{SignedRoot, TreeHash};
use tree_hash::{merkleize::merkle_root, SignedRoot, TreeHash};
use tree_hash_derive::{CachedTreeHash, SignedRoot, TreeHash};
#[derive(Clone, Debug, TreeHash, CachedTreeHash)]
@@ -120,7 +120,7 @@ impl CryptoKitties {
leaves.append(&mut self.best_kitty.tree_hash_root());
leaves.append(&mut self.worst_kitty.tree_hash_root());
leaves.append(&mut self.kitties.tree_hash_root());
tree_hash::merkle_root(&leaves)
merkle_root(&leaves)
}
}
@@ -158,14 +158,14 @@ impl Casper {
let mut list = Vec::new();
list.append(&mut self.friendly.tree_hash_root());
list.append(&mut self.friends.tree_hash_root());
tree_hash::merkle_root(&list)
merkle_root(&list)
}
fn expected_tree_hash(&self) -> Vec<u8> {
let mut list = Vec::new();
list.append(&mut self.friendly.tree_hash_root());
list.append(&mut self.dead.tree_hash_root());
tree_hash::merkle_root(&list)
merkle_root(&list)
}
}