mii/merkle.rs
1
0
Fork 0
mirror of https://github.com/mii443/merkle.rs.git synced 2025-08-22 16:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate the leafs hash domain from the internal nodes' one (#22)

Browse Source 
* Separate the leafs hash domain from the internal nodes' one.

This change prevents an internal node from having the same hash as a leaf,
and thus from potentially ending up with two different trees with the same root hash.

Close #20

* Align with the CT spec, and allows building a tree from an empty dataset.

Fixes #20. Prepares #24.
This commit is contained in:
Romain Ruetschi
2016-12-19 16:14:41 +01:00
committed by Frederic Jacobs
parent bebbcde461
commit bce59c9f39
7 changed files with 114 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
benches/lib.rs
View File

@ -30,7 +30,7 @@ fn bench_small_str_tree(b: &mut Bencher) {
#[bench]
fn bench_small_str_proof_gen(b: &mut Bencher) {
let values = vec!["one", "two", "three", "four"];
let tree = MerkleTree::from_vec(digest, values.clone()).unwrap();
let tree = MerkleTree::from_vec(digest, values.clone());
b.iter(|| {
for value in &values {
@ -43,7 +43,7 @@ fn bench_small_str_proof_gen(b: &mut Bencher) {
#[bench]
fn bench_small_str_proof_check(b: &mut Bencher) {
let values = vec!["one", "two", "three", "four"];
let tree = MerkleTree::from_vec(digest, values.clone()).unwrap();
let tree = MerkleTree::from_vec(digest, values.clone());
let proofs = values.iter().map(|v| tree.gen_proof(v).unwrap()).collect::<Vec<_>>();
b.iter(|| {
@ -63,7 +63,8 @@ fn bench_big_rnd_tree(b: &mut Bencher) {
}
b.iter(|| {
MerkleTree::from_vec(digest, values.clone()).unwrap()
let tree = MerkleTree::from_vec(digest, values.clone());
test::black_box(tree)
});
}
@ -76,7 +77,7 @@ fn bench_big_rnd_proof_gen(b: &mut Bencher) {
rng.fill_bytes(&mut v);
}
let tree = MerkleTree::from_vec(digest, values.clone()).unwrap();
let tree = MerkleTree::from_vec(digest, values.clone());
b.iter(|| {
for value in &values {
@ -95,8 +96,10 @@ fn bench_big_rnd_proof_check(b: &mut Bencher) {
rng.fill_bytes(&mut v);
}
let tree = MerkleTree::from_vec(digest, values.clone()).unwrap();
let proofs = values.into_iter().map(|v| tree.gen_proof(v).unwrap()).collect::<Vec<_>>();
let tree = MerkleTree::from_vec(digest, values.clone());
let proofs = values.into_iter()
.map(|v| tree.gen_proof(v).unwrap())
.collect::<Vec<_>>();
b.iter(|| {
for proof in &proofs {
@ -114,7 +117,7 @@ fn bench_big_rnd_iter(b: &mut Bencher) {
rng.fill_bytes(&mut v);
}
let tree = MerkleTree::from_vec(digest, values.clone()).unwrap();
let tree = MerkleTree::from_vec(digest, values.clone());
b.iter(|| {
for value in &tree {