Refactor SpartanProver trait and implementations to use generic CryptoInt types (#99)

Author: cupicmarko

benches/spartan_benches.rs

@@ -45,7 +45,7 @@ fn benchmark_spartan_prover<const I: usize, const N: usize>(
                 KeccakTranscript::new,
                 |mut prover_transcript| {
                     black_box(
-                        SpartanProver::<I, _>::prove(
+                        SpartanProver::<Int<I>, _>::prove(
                             &prover,
                             &statement_f,
                             &z_ccs,
@@ -87,7 +87,7 @@ fn benchmark_spartan_verifier<const I: usize, const N: usize>(
             )
             .expect("Failed to prepare for random field PIOP");
 
-        let (spartan_proof, _) = SpartanProver::<I, _>::prove(
+        let (spartan_proof, _) = SpartanProver::<Int<I>, _>::prove(
             &prover,
             &statement_f,
             &z_ccs,

src/zinc/prover.rs

@@ -19,7 +19,7 @@ use crate::{
     poly_z::mle::DenseMultilinearExtension as DenseMultilinearExtensionZ,
     sparse_matrix::SparseMatrix,
     sumcheck::{utils::build_eq_x_r, MLSumcheck, SumcheckProof},
-    traits::{ConfigReference, Field, FieldMap},
+    traits::{ConfigReference, CryptoInt, Field, FieldMap},
     transcript::KeccakTranscript,
     zip::{code::ZipSpec, pcs::structs::MultilinearZip, pcs_transcript::PcsTranscript},
 };
@@ -66,7 +66,7 @@ where
             Self::prepare_for_random_field_piop(statement, wit, ccs, config)?;
 
         // Prove Spartan protocol over random field
-        let (spartan_proof, r_y) = SpartanProver::<I, F>::prove(
+        let (spartan_proof, r_y) = SpartanProver::<Int<I>, F>::prove(
             self,
             &statement_f,
             &z_ccs,
@@ -88,7 +88,7 @@ where
     }
 }
 /// Prover for the Spartan protocol
-pub trait SpartanProver<const I: usize, F: Field> {
+pub trait SpartanProver<I: CryptoInt, F: Field> {
     /// Generates a proof for the spartan protocol
     ///
     /// # Arguments
@@ -112,14 +112,14 @@ pub trait SpartanProver<const I: usize, F: Field> {
         &self,
         statement_f: &Statement_F<F>,
         z_ccs: &[F],
-        z_mle: &DenseMultilinearExtensionZ<Int<I>>,
+        z_mle: &DenseMultilinearExtensionZ<I>,
         ccs_f: &CCS_F<F>,
         transcript: &mut KeccakTranscript,
         config: F::Cr,
     ) -> SpartanResult<(SpartanProof<F>, Vec<F>), F>;
 }
 
-impl<const I: usize, F: Field, S: ZipSpec> SpartanProver<I, F> for ZincProver<Int<I>, F, S>
+impl<const I: usize, F: Field, S: ZipSpec> SpartanProver<Int<I>, F> for ZincProver<Int<I>, F, S>
 where
     for<'a> Int<I>: From<&'a F::I>,
     for<'a> F::CryptoInt: From<&'a BigInt<I>>, // TODO

src/zinc/tests.rs

@@ -37,7 +37,7 @@ fn test_dummy_spartan_prover() {
         )
         .expect("Failed to prepare for random field PIOP");
 
-    let proof = SpartanProver::<I, RandomField<N>>::prove(
+    let proof = SpartanProver::<Int<I>, RandomField<N>>::prove(
         &prover,
         &statement_f,
         &z_ccs,
@@ -70,7 +70,7 @@ fn test_spartan_verifier() {
         )
         .expect("Failed to prepare for random field PIOP");
 
-    let (spartan_proof, _) = SpartanProver::<I, RandomField<N>>::prove(
+    let (spartan_proof, _) = SpartanProver::<Int<I>, RandomField<N>>::prove(
         &prover,
         &statement_f,
         &z_ccs,
@@ -117,7 +117,7 @@ fn test_dummy_spartan_verifier() {
         )
         .expect("Failed to prepare for random field PIOP");
 
-    let (spartan_proof, _) = SpartanProver::<I, RandomField<N>>::prove(
+    let (spartan_proof, _) = SpartanProver::<Int<I>, RandomField<N>>::prove(
         &prover,
         &statement_f,
         &z_ccs,
@@ -164,7 +164,7 @@ fn test_failing_spartan_verifier() {
         )
         .expect("Failed to prepare for random field PIOP");
 
-    let (spartan_proof, _) = SpartanProver::<I, RandomField<N>>::prove(
+    let (spartan_proof, _) = SpartanProver::<Int<I>, RandomField<N>>::prove(
         &prover,
         &statement_f,
         &z_ccs,