Refactoring from initial code review

Co-authored-by: ebfull <ewillbefull@gmail.com>

src/arithmetic.rs

@@ -432,7 +432,7 @@ fn log2_floor(num: usize) -> u32 {
 }
 
 /// Returns coefficients of an n - 1 degree polynomial given a set of n points and their evaluations
-pub fn interpolate<F: Field>(points: Vec<F>, evals: Vec<F>) -> Vec<F> {
+pub fn interpolate<F: Field>(points: &[F], evals: &[F]) -> Vec<F> {
     assert_eq!(points.len(), evals.len());
     if points.len() == 1 {
         // Constant polynomial

src/poly/multiopen.rs

@@ -12,14 +12,14 @@ mod verifier;
 /// This is a multi-point opening proof used in the polynomial commitment scheme opening.
 #[derive(Debug, Clone)]
 pub struct Proof<C: CurveAffine> {
-    /// A vector of evaluations at each set of query points
+    // A vector of evaluations at each set of query points
-    pub q_evals: Vec<C::Scalar>,
+    q_evals: Vec<C::Scalar>,
 
-    /// Commitment to final polynomial
+    // Commitment to final polynomial
-    pub f_commitment: C,
+    f_commitment: C,
 
-    /// Commitment proof
+    // Commitment proof
-    pub opening: commitment::Proof<C>,
+    opening: commitment::Proof<C>,
 }
 
 /// A polynomial query at a point

src/poly/multiopen/prover.rs

@@ -84,41 +84,31 @@ impl<C: CurveAffine> Proof<C> {
 
         let x_5: C::Scalar = get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128()));
 
-        // Interpolate polynomial for evaluations at each set
+        let f_poly = point_sets
-        let mut r_polys: Vec<Vec<C::Scalar>> = Vec::with_capacity(point_sets.len());
+            .iter()
-        for (points, evals) in point_sets.iter().zip(q_eval_sets.iter()) {
+            .zip(q_eval_sets.iter())
-            r_polys.push(interpolate(points.clone(), evals.clone()));
+            .zip(q_polys.iter())
-        }
+            .fold(None, |f_poly, ((points, evals), poly)| {
-
+                let mut poly = poly.clone()?.values;
-        let mut f_poly: Option<Polynomial<C::Scalar, Coeff>> = None;
+                // TODO: makes implicit asssumption that poly degree is smaller than interpolation poly degree
-        for (set_idx, point_set) in point_sets.clone().iter().enumerate() {
+                for (p, r) in poly.iter_mut().zip(interpolate(points, evals)) {
-            let mut poly = q_polys[set_idx].as_ref().unwrap().clone();
+                    *p -= &r;
-            for (coeff_idx, coeff) in r_polys[set_idx].iter().enumerate() {
+                }
-                poly[coeff_idx] -= coeff;
+                let mut poly = points
-            }
+                    .iter()
-            // TODO: change kate_division interface?
+                    .fold(poly, |poly, point| kate_division(&poly, *point));
-            let mut tmp_poly = poly.clone();
+                poly.resize(params.n as usize, C::Scalar::zero());
-            for point in point_set {
+                let poly = Polynomial {
-                let mut poly = kate_division(&tmp_poly[..], *point);
-                poly.push(C::Scalar::zero());
-                tmp_poly = Polynomial {
                     values: poly,
                     _marker: PhantomData,
                 };
-            }
 
-            f_poly = f_poly
+                if f_poly.is_none() {
-                .map(|mut f_poly| {
+                    Some(poly)
-                    parallelize(&mut f_poly, |q, start| {
+                } else {
-                        for (q, a) in q.iter_mut().zip(tmp_poly[start..].iter()) {
+                    f_poly.map(|f_poly| f_poly * x_5 + &poly)
-                            *q *= &x_5;
+                }
-                            *q += a;
+            });
-                        }
-                    });
-                    f_poly
-                })
-                .or_else(|| Some(tmp_poly));
-        }
 
         let f_poly = f_poly.unwrap();
         let mut f_blind = Blind(C::Scalar::random());
@@ -132,11 +122,10 @@ impl<C: CurveAffine> Proof<C> {
             let x_6: C::Scalar =
                 get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128()));
 
-            let mut q_evals = vec![C::Scalar::zero(); point_sets.len()];
+            let q_evals: Vec<C::Scalar> = q_polys
-
+                .iter()
-            for (set_idx, _) in point_sets.iter().enumerate() {
+                .map(|poly| eval_polynomial(poly.as_ref().unwrap(), x_6))
-                q_evals[set_idx] = eval_polynomial(&q_polys[set_idx].as_ref().unwrap(), x_6);
+                .collect();
-            }
 
             for eval in q_evals.iter() {
                 transcript_scalar.absorb(*eval);
@@ -149,25 +138,18 @@ impl<C: CurveAffine> Proof<C> {
             let x_7: C::Scalar =
                 get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128()));
 
-            let mut f_blind_dup = f_blind;
+            let (f_poly, f_blind_try) = q_polys.iter().zip(q_blinds.iter()).fold(
-            let mut f_poly = f_poly.clone();
+                (f_poly.clone(), f_blind),
-            for (set_idx, _) in point_sets.iter().enumerate() {
+                |(f_poly, f_blind), (poly, blind)| {
-                f_blind_dup *= x_7;
+                    (
-                f_blind_dup += q_blinds[set_idx];
+                        f_poly * x_7 + &poly.clone().unwrap(),
-
+                        Blind((f_blind.0 * &x_7) + &blind.0),
-                parallelize(&mut f_poly, |f, start| {
+                    )
-                    for (f, a) in f
+                },
-                        .iter_mut()
+            );
-                        .zip(q_polys[set_idx].as_ref().unwrap()[start..].iter())
-                    {
-                        *f *= &x_7;
-                        *f += a;
-                    }
-                });
-            }
 
             if let Ok(opening) =
-                commitment::Proof::create(&params, &mut transcript, &f_poly, f_blind_dup, x_6)
+                commitment::Proof::create(&params, &mut transcript, &f_poly, f_blind_try, x_6)
             {
                 break (opening, q_evals);
             } else {

src/poly/multiopen/verifier.rs

@@ -84,7 +84,7 @@ impl<'a, C: CurveAffine> Proof<C> {
         let mut r_evals = vec![C::Scalar::zero(); point_sets.len()];
         let mut r_polys: Vec<Vec<C::Scalar>> = Vec::with_capacity(point_sets.len());
         for (points, evals) in point_sets.clone().iter().zip(q_eval_sets.clone().iter()) {
-            r_polys.push(interpolate(points.clone(), evals.clone()));
+            r_polys.push(interpolate(&points, &evals));
         }
         for (r_eval, r_poly) in r_evals.iter_mut().zip(r_polys.iter()) {
             *r_eval = eval_polynomial(r_poly, x_6);