shortend struct init for multipath

Author: intx4

src/merkle_tree/mod.rs

@@ -7,7 +7,7 @@ use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::borrow::Borrow;
 use ark_std::hash::Hash;
 use ark_std::vec::Vec;
-use ark_std::collections::{BTreeSet, HashMap};
+use std::collections::{BTreeSet, HashMap};
 
 #[cfg(test)]
 mod tests;
@@ -107,9 +107,8 @@ pub type LeafParam<P> = <<P as Config>::LeafHash as CRHScheme>::Parameters;
 ///    [I] J
 /// ```
 ///  Suppose we want to prove I, then `leaf_sibling_hash` is J, `auth_path` is `[C,D]`
-#[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
+#[derive(PartialEq, Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(
-    PartialEq(bound = "P: Config"),
     Clone(bound = "P: Config"),
     Debug(bound = "P: Config"),
     Default(bound = "P: Config")
@@ -270,9 +269,9 @@ impl<P: Config> MultiPath<P> {
 
         Ok(MultiPath {
             leaf_indexes: indexes,
-            auth_paths_prefix_lenghts: auth_paths_prefix_lenghts,
-            auth_paths_suffixes: auth_paths_suffixes,
-            leaf_siblings_hashes: leaf_siblings_hashes,
+            auth_paths_prefix_lenghts,
+            auth_paths_suffixes,
+            leaf_siblings_hashes,
         })
     }
 
@@ -309,20 +308,20 @@ impl<P: Config> MultiPath<P> {
     ) -> Result<bool, crate::Error> {
         // array of auth paths as arrays of InnerDigests
 
-        let mut leaves = leaves.into_iter();
+        let leaves: Vec<L> = leaves.into_iter().collect();
 
-        let mut auth_paths: Vec<Vec<P::InnerDigest>> = self.decompress()?.peekable();
+        let auth_paths: Vec<Vec<P::InnerDigest>> = self.decompress()?.collect();
 
-        let tree_height = auth_paths.peek().unwrap().len() + 2;
+        let tree_height = auth_paths[0].len() + 2;
 
         // LookUp table to speedup computation avoid redundant hash computations
         let mut hash_lut: HashMap<usize, P::InnerDigest> = HashMap::new();
 
         for i in 0..self.leaf_indexes.len() {
             let leaf_index = self.leaf_indexes[i];
-            let leaf = leaves.next().unwrap();
+            let leaf = &leaves[i];
             let leaf_sibling_hash = &self.leaf_siblings_hashes[i];
-            let auth_path = auth_paths.next().unwrap();
+            let auth_path = &auth_paths[i];
 
             let claimed_leaf_hash = P::LeafHash::evaluate(&leaf_hash_params, leaf.clone())?;
             let (left_child, right_child) =