Merge branch 'snarkpack-integration' into feat/mipp-module

Author: nikkolasg

src/r1csproof.rs

@@ -527,9 +527,9 @@ mod tests {
 
   #[test]
   pub fn check_r1cs_proof() {
-    let num_vars = 1024;
+    let num_vars = 16;
     let num_cons = num_vars;
-    let num_inputs = 10;
+    let num_inputs = 3;
     let (inst, vars, input) = R1CSInstance::produce_synthetic_r1cs(num_cons, num_vars, num_inputs);
 
     let gens = R1CSGens::new(b"test-m", num_cons, num_vars);

src/sqrt_pst.rs

@@ -62,7 +62,7 @@ impl Polynomial {
 
   // Given point = (\vec{a}, \vec{b}), compute the polynomial q as
   // q(Y) =
-  // \sum_{j \in \{0,1\}^m}(\sum_{i \in \{0,1\}^m} p(j,i) * chi_i(a)) * chi_j(Y)
+  // \sum_{j \in \{0,1\}^m}(\sum_{i \in \{0,1\}^m} p(j,i) * chi_i(b)) * chi_j(Y)
   // and p(a,b) = q(b) where p is the initial polynomial
   fn get_q(&mut self, point: &[Scalar]) {
     let q_timer = Timer::new("build_q");
@@ -163,7 +163,12 @@ impl Polynomial {
   ) -> (Commitment<I>, Proof<I>, MippProof<I>) {
     let m = point.len() / 2;
     let a = &point[0..m];
-    let b = &point[m..2 * m];
+
+    if self.q.is_none() {
+      self.get_q(point);
+    }
+
+    let q = self.q.clone().unwrap();
 
     if self.q.is_none() {
       self.get_q(point);
@@ -207,16 +212,14 @@ impl Polynomial {
         .unwrap();
     timer_mipp_proof.stop();
 
-    // PST proof for opening q at b
+    // PST proof for opening q at a
     let timer_proof = Timer::new("pst_open");
     let mut a_rev = a.to_vec().clone();
     a_rev.reverse();
     let pst_proof = MultilinearPC::<I>::open(ck, &q, &a_rev);
     timer_proof.stop();
 
     timer_open.stop();
-
-    // TODO: add MIPP proof as return value
     (U, pst_proof, mipp_proof)
   }