Cleanup tests a bit.

This commit is contained in:
Romain Ruetschi
2016-11-11 14:18:03 +01:00
parent 6634a824c5
commit de4a0a1572

View File

@ -14,14 +14,18 @@ mod tests {
let mut digest = Sha3::sha3_256();
let values = vec![1, 2, 3];
let hashes = vec![digest.hash_bytes(&1.to_bytes()), digest.hash_bytes(&2.to_bytes()), digest.hash_bytes(&3.to_bytes())];
let hashes = vec![
digest.hash_bytes(&1.to_bytes()),
digest.hash_bytes(&2.to_bytes()),
digest.hash_bytes(&3.to_bytes())
];
let tree = MerkleTree::from_vec(digest, values);
let tree = MerkleTree::from_vec(digest, values);
let root_hash = Sha3::sha3_256().combine_hashes(
&Sha3::sha3_256().combine_hashes(&hashes[0], &hashes[1]),
&hashes[2]
);
let mut d = Sha3::sha3_256();
let h01 = &d.combine_hashes(&hashes[0], &hashes[1]);
let h2 = &hashes[2];
let root_hash = &d.combine_hashes(h01, h2);
assert_eq!(tree.count, 3);
assert_eq!(tree.height, 2);
@ -36,21 +40,20 @@ mod tests {
let hashes = values.clone().iter().map(|v| digest.hash_bytes(&v.to_bytes())).collect::<Vec<_>>();
let count = values.len();
let tree = MerkleTree::from_vec(digest, values);
let tree = MerkleTree::from_vec(digest, values);
let root_hash = Sha3::sha3_256().combine_hashes(
&Sha3::sha3_256().combine_hashes(
&Sha3::sha3_256().combine_hashes(
&Sha3::sha3_256().combine_hashes(&hashes[0], &hashes[1]),
&Sha3::sha3_256().combine_hashes(&hashes[2], &hashes[3])
),
&Sha3::sha3_256().combine_hashes(
&Sha3::sha3_256().combine_hashes(&hashes[4], &hashes[5]),
&Sha3::sha3_256().combine_hashes(&hashes[6], &hashes[7])
)
),
&hashes[8]
);
let mut d = Sha3::sha3_256();
let h01 = &d.combine_hashes(&hashes[0], &hashes[1]);
let h23 = &d.combine_hashes(&hashes[2], &hashes[3]);
let h45 = &d.combine_hashes(&hashes[4], &hashes[5]);
let h67 = &d.combine_hashes(&hashes[6], &hashes[7]);
let h8 = &hashes[8];
let h0123 = &d.combine_hashes(h01, h23);
let h4567 = &d.combine_hashes(h45, h67);
let h1to7 = &d.combine_hashes(h0123, h4567);
let root_hash = &d.combine_hashes(h1to7, h8);
assert_eq!(tree.count, count);
assert_eq!(tree.height, 4);