Fix clippy warnings in tests

This commit is contained in:
Romain Ruetschi
2018-07-19 11:23:51 +01:00
parent 0e8450098c
commit d3b05754cf

View File

@ -51,7 +51,7 @@ fn test_from_vec1() {
let values = vec!["hello, world".to_string()];
let tree = MerkleTree::from_vec(digest, values);
let root_hash = &digest.hash_leaf(&"hello, world".as_bytes());
let root_hash = &digest.hash_leaf(b"hello, world");
assert_eq!(tree.count(), 1);
assert_eq!(tree.height(), 0);
@ -156,9 +156,7 @@ fn test_mutate_proof_first_lemma() {
let tree = MerkleTree::from_vec(digest, values.clone());
let root_hash = tree.root_hash();
let mut i = 0;
for value in values {
for (i, value) in values.into_iter().enumerate() {
let mut proof = tree.gen_proof(value).unwrap();
match i % 3 {
@ -175,8 +173,6 @@ fn test_mutate_proof_first_lemma() {
let is_valid = proof.validate(root_hash);
assert_eq!(is_valid, false);
i += 1;
}
}
@ -184,7 +180,7 @@ fn test_mutate_proof_first_lemma() {
fn test_tree_iter() {
let values = (1..10).map(|x| vec![x]).collect::<Vec<_>>();
let tree = MerkleTree::from_vec(digest, values.clone());
let iter = tree.iter().map(|x| x.clone()).collect::<Vec<_>>();
let iter = tree.iter().cloned().collect::<Vec<_>>();
assert_eq!(values, iter);
}
@ -193,7 +189,7 @@ fn test_tree_iter() {
fn test_tree_into_iter() {
let values = (1..10).map(|x| vec![x]).collect::<Vec<_>>();
let tree = MerkleTree::from_vec(digest, values.clone());
let iter = tree.into_iter().map(|x| x.clone()).collect::<Vec<_>>();
let iter = tree.iter().cloned().collect::<Vec<_>>();
assert_eq!(values, iter);
}
@ -236,8 +232,8 @@ pub struct PublicKey {
impl PublicKey {
pub fn new(zero_values: Vec<Vec<u8>>, one_values: Vec<Vec<u8>>) -> Self {
PublicKey {
zero_values: zero_values,
one_values: one_values,
zero_values,
one_values,
}
}