From a30719c245989cc3c009b745bf5744b54e9a3bee Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Fri, 16 Oct 2020 08:43:41 +0800
Subject: [PATCH] Minor changes to multiopen

Co-authored-by: ebfull <ewillbefull@gmail.com>
---
 src/poly/multiopen/prover.rs   | 8 ++++----
 src/poly/multiopen/verifier.rs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/poly/multiopen/prover.rs b/src/poly/multiopen/prover.rs
index 2e5a967..fbe7dc9 100644
--- a/src/poly/multiopen/prover.rs
+++ b/src/poly/multiopen/prover.rs
@@ -43,9 +43,9 @@ impl<C: CurveAffine> Proof<C> {
 
         // A vec of vecs of evals. The outer vec corresponds to the point set,
         // while the inner vec corresponds to the points in a particular set.
-        let mut q_eval_sets: Vec<Vec<_>> = vec![Vec::new(); point_sets.len()];
-        for (set_idx, point_set) in point_sets.iter().enumerate() {
-            q_eval_sets[set_idx] = vec![C::Scalar::zero(); point_set.len()];
+        let mut q_eval_sets = Vec::with_capacity(point_sets.len());
+        for point_set in point_sets.iter() {
+            q_eval_sets.push(vec![C::Scalar::zero(); point_set.len()]);
         }
 
         {
@@ -83,7 +83,7 @@ impl<C: CurveAffine> Proof<C> {
             .zip(q_eval_sets.iter())
             .zip(q_polys.iter())
             .fold(None, |f_poly, ((points, evals), poly)| {
-                let mut poly = poly.clone()?.values;
+                let mut poly = poly.clone().unwrap().values;
                 // TODO: makes implicit asssumption that poly degree is smaller than interpolation poly degree
                 for (p, r) in poly.iter_mut().zip(lagrange_interpolate(points, evals)) {
                     *p -= &r;
diff --git a/src/poly/multiopen/verifier.rs b/src/poly/multiopen/verifier.rs
index 0366eac..f674e31 100644
--- a/src/poly/multiopen/verifier.rs
+++ b/src/poly/multiopen/verifier.rs
@@ -49,9 +49,9 @@ impl<C: CurveAffine> Proof<C> {
 
         // A vec of vecs of evals. The outer vec corresponds to the point set,
         // while the inner vec corresponds to the points in a particular set.
-        let mut q_eval_sets: Vec<Vec<C::Scalar>> = vec![Vec::new(); point_sets.len()];
-        for (set_idx, point_set) in point_sets.iter().enumerate() {
-            q_eval_sets[set_idx] = vec![C::Scalar::zero(); point_set.len()];
+        let mut q_eval_sets = Vec::with_capacity(point_sets.len());
+        for point_set in point_sets.iter() {
+            q_eval_sets.push(vec![C::Scalar::zero(); point_set.len()]);
         }
         {
             let mut accumulate = |set_idx: usize, new_commitment, evals: Vec<C::Scalar>| {
@@ -114,7 +114,7 @@ impl<C: CurveAffine> Proof<C> {
         // Compute the final commitment that has to be opened
         let mut commitment_msm = params.empty_msm();
         commitment_msm.add_term(C::Scalar::one(), self.f_commitment);
-        let (commitment_msm, msm_eval) = q_commitments.iter().zip(self.q_evals.iter()).fold(
+        let (commitment_msm, msm_eval) = q_commitments.into_iter().zip(self.q_evals.iter()).fold(
             (commitment_msm, msm_eval),
             |(mut commitment_msm, msm_eval), (q_commitment, q_eval)| {
                 commitment_msm.scale(x_7);