Use iterators in construct_mmr_tree

librustzcash/src/rustzcash.rs

@@ -1199,31 +1199,17 @@ fn construct_mmr_tree(
         )
     };
 
-    let mut peaks = Vec::new();
+    let mut peaks: Vec<_> = indices
-    for i in 0..p_len {
+        .iter()
-        peaks.push((
+        .zip(nodes.iter())
-            indices[i],
+        .map(
-            match MMREntry::from_bytes(cbranch, &nodes[i][..]) {
+            |(index, node)| match MMREntry::from_bytes(cbranch, &node[..]) {
-                Ok(entry) => entry,
+                Ok(entry) => Ok((*index, entry)),
-                _ => {
+                Err(_) => Err("Invalid encoding"),
-                    return Err("Invalid encoding");
-                } // error
             },
-        ));
+        )
-    }
+        .collect::<Result<_, _>>()?;
-
+    let extra = peaks.split_off(p_len);
-    let mut extra = Vec::new();
-    for i in p_len..(p_len + e_len) {
-        extra.push((
-            indices[i],
-            match MMREntry::from_bytes(cbranch, &nodes[i][..]) {
-                Ok(entry) => entry,
-                _ => {
-                    return Err("Invalid encoding");
-                } // error
-            },
-        ));
-    }
 
     Ok(MMRTree::new(t_len, peaks, extra))
 }