Cut duplicate code (#261)

* cut duplicate code

* bound --> bind for clarity

* expose asm feature

Cargo.toml

@@ -71,6 +71,7 @@ harness = false
 
 [features]
 default = []
+asm = ["halo2curves/asm"]
 # Compiles in portable mode, w/o ISA extensions => binary can be executed on all systems.
 portable = ["pasta-msm/portable"]
 cuda = ["neptune/cuda", "neptune/pasta", "neptune/arity24"]

src/lib.rs

@@ -979,11 +979,25 @@ mod tests {
     let trivial_circuit2_grumpkin = TrivialCircuit::<<grumpkin::Point as Group>::Scalar>::default();
     let cubic_circuit1_grumpkin = CubicCircuit::<<bn256::Point as Group>::Scalar>::default();
 
+    #[cfg(feature = "asm")]
+    test_pp_digest_with::<bn256::Point, grumpkin::Point, _, _>(
+      &trivial_circuit1_grumpkin,
+      &trivial_circuit2_grumpkin,
+      "c4ecd363a6c1473de7e0d24fc1dbb660f563556e2e13fb4614acdff04cab7701",
+    );
+    #[cfg(feature = "asm")]
+    test_pp_digest_with::<bn256::Point, grumpkin::Point, _, _>(
+      &cubic_circuit1_grumpkin,
+      &trivial_circuit2_grumpkin,
+      "4853a6463b6309f6ae76442934d0a423f51f1e10abaddd0d39bf5644ed589100",
+    );
+    #[cfg(not(feature = "asm"))]
     test_pp_digest_with::<bn256::Point, grumpkin::Point, _, _>(
       &trivial_circuit1_grumpkin,
       &trivial_circuit2_grumpkin,
       "c26cc841d42c19bf98bc2482e66cd30903922f2a923927b85d66f375a821f101",
     );
+    #[cfg(not(feature = "asm"))]
     test_pp_digest_with::<bn256::Point, grumpkin::Point, _, _>(
       &cubic_circuit1_grumpkin,
       &trivial_circuit2_grumpkin,

src/provider/bn256_grumpkin.rs

@@ -42,18 +42,6 @@ pub mod grumpkin {
   };
 }
 
-impl<G: Group> TranscriptReprTrait<G> for grumpkin::Base {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
-}
-
-impl<G: Group> TranscriptReprTrait<G> for grumpkin::Scalar {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
-}
-
 impl_traits!(
   bn256,
   Bn256Compressed,

src/provider/mod.rs

@@ -339,6 +339,12 @@ macro_rules! impl_traits {
         Some($name_curve::from_bytes(&self).unwrap())
       }
     }
+
+    impl<G: Group> TranscriptReprTrait<G> for $name::Scalar {
+      fn to_transcript_bytes(&self) -> Vec<u8> {
+        self.to_repr().to_vec()
+      }
+    }
   };
 }
 

src/provider/pasta.rs

@@ -187,19 +187,13 @@ macro_rules! impl_traits {
         Some($name_curve::from_bytes(&self.repr).unwrap())
       }
     }
-  };
-}
-
-impl<G: Group> TranscriptReprTrait<G> for pallas::Base {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
-}
 
-impl<G: Group> TranscriptReprTrait<G> for pallas::Scalar {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
+    impl<G: Group> TranscriptReprTrait<G> for $name::Scalar {
+      fn to_transcript_bytes(&self) -> Vec<u8> {
+        self.to_repr().to_vec()
+      }
+    }
+  };
 }
 
 impl_traits!(

src/provider/secp_secq.rs

@@ -39,18 +39,6 @@ pub mod secq256k1 {
   };
 }
 
-impl<G: Group> TranscriptReprTrait<G> for secp256k1::Base {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
-}
-
-impl<G: Group> TranscriptReprTrait<G> for secp256k1::Scalar {
-  fn to_transcript_bytes(&self) -> Vec<u8> {
-    self.to_repr().to_vec()
-  }
-}
-
 impl_traits!(
   secp256k1,
   Secp256k1Compressed,

src/spartan/polys/multilinear.rs

@@ -60,7 +60,7 @@ impl<Scalar: PrimeField> MultilinearPolynomial<Scalar> {
   /// Bounds the polynomial's top variable using the given scalar.
   ///
   /// This operation modifies the polynomial in-place.
-  pub fn bound_poly_var_top(&mut self, r: &Scalar) {
+  pub fn bind_poly_var_top(&mut self, r: &Scalar) {
     let n = self.len() / 2;
 
     let (left, right) = self.Z.split_at_mut(n);

src/spartan/ppsnark.rs

@@ -559,7 +559,7 @@ impl<G: Group> SumcheckEngine<G> for MemorySumcheckInstance<G> {
       &mut self.poly_eq,
     ]
     .par_iter_mut()
-    .for_each(|poly| poly.bound_poly_var_top(r));
+    .for_each(|poly| poly.bind_poly_var_top(r));
   }
 
   fn final_claims(&self) -> Vec<Vec<G::Scalar>> {
@@ -675,7 +675,7 @@ impl<G: Group> SumcheckEngine<G> for OuterSumcheckInstance<G> {
       &mut self.poly_Mz,
     ]
     .par_iter_mut()
-    .for_each(|poly| poly.bound_poly_var_top(r));
+    .for_each(|poly| poly.bind_poly_var_top(r));
   }
 
   fn final_claims(&self) -> Vec<Vec<G::Scalar>> {
@@ -725,7 +725,7 @@ impl<G: Group> SumcheckEngine<G> for InnerSumcheckInstance<G> {
       &mut self.poly_val,
     ]
     .par_iter_mut()
-    .for_each(|poly| poly.bound_poly_var_top(r));
+    .for_each(|poly| poly.bind_poly_var_top(r));
   }
 
   fn final_claims(&self) -> Vec<Vec<G::Scalar>> {

src/spartan/sumcheck.rs

@@ -125,8 +125,8 @@ impl<G: Group> SumcheckProof<G> {
 
       // bound all tables to the verifier's challenege
       rayon::join(
-        || poly_A.bound_poly_var_top(&r_i),
-        || poly_B.bound_poly_var_top(&r_i),
+        || poly_A.bind_poly_var_top(&r_i),
+        || poly_B.bind_poly_var_top(&r_i),
       );
     }
 
@@ -181,8 +181,8 @@ impl<G: Group> SumcheckProof<G> {
         .zip(poly_B_vec.par_iter_mut())
         .for_each(|(poly_A, poly_B)| {
           let _ = rayon::join(
-            || poly_A.bound_poly_var_top(&r_i),
-            || poly_B.bound_poly_var_top(&r_i),
+            || poly_A.bind_poly_var_top(&r_i),
+            || poly_B.bind_poly_var_top(&r_i),
           );
         });
 
@@ -339,14 +339,14 @@ impl<G: Group> SumcheckProof<G> {
       rayon::join(
         || {
           rayon::join(
-            || poly_A.bound_poly_var_top(&r_i),
-            || poly_B.bound_poly_var_top(&r_i),
+            || poly_A.bind_poly_var_top(&r_i),
+            || poly_B.bind_poly_var_top(&r_i),
           )
         },
         || {
           rayon::join(
-            || poly_C.bound_poly_var_top(&r_i),
-            || poly_D.bound_poly_var_top(&r_i),
+            || poly_C.bind_poly_var_top(&r_i),
+            || poly_D.bind_poly_var_top(&r_i),
           )
         },
       );