chore: formatting

benches/compressed-snark.rs

@@ -1,10 +1,10 @@
 #![allow(non_snake_case)]
 
 use bellpepper_core::{num::AllocatedNum, ConstraintSystem, SynthesisError};
-use halo2curves::bn256::Bn256;
 use core::marker::PhantomData;
 use criterion::{measurement::WallTime, *};
 use ff::PrimeField;
+use halo2curves::bn256::Bn256;
 use nova_snark::{
   provider::{Bn256EngineKZG, GrumpkinEngine},
   traits::{

benches/ppsnark.rs

@@ -1,10 +1,10 @@
 #![allow(non_snake_case)]
 
 use bellpepper_core::{num::AllocatedNum, ConstraintSystem, SynthesisError};
-use halo2curves::bn256::Bn256;
 use core::marker::PhantomData;
 use criterion::*;
 use ff::PrimeField;
+use halo2curves::bn256::Bn256;
 use nova_snark::{
   provider::Bn256EngineKZG,
   spartan::direct::DirectSNARK,

src/lib.rs

@@ -850,8 +850,8 @@ mod tests {
   use super::*;
   use crate::{
     provider::{
-      traits::DlogGroup, Bn256EngineIPA, Bn256EngineKZG, Bn256EngineZM,
-      GrumpkinEngine, PallasEngine, Secp256k1Engine, Secq256k1Engine, VestaEngine, non_hiding_zeromorph::ZMPCS,
+      non_hiding_zeromorph::ZMPCS, traits::DlogGroup, Bn256EngineIPA, Bn256EngineKZG,
+      Bn256EngineZM, GrumpkinEngine, PallasEngine, Secp256k1Engine, Secq256k1Engine, VestaEngine,
     },
     traits::{circuit::TrivialCircuit, evaluation::EvaluationEngineTrait, snark::default_ck_hint},
   };

src/provider/hyperkzg.rs

@@ -424,9 +424,10 @@ mod tests {
   use super::*;
   use crate::provider::test_utils::prove_verify_from_num_vars;
   use crate::{
-    provider::keccak::Keccak256Transcript, CommitmentKey,
+    provider::keccak::Keccak256Transcript, provider::kzg_commitment::KZGCommitmentEngine,
   };
   use bincode::Options;
+  use halo2curves::bn256::Bn256;
 
   type E = halo2curves::bn256::Bn256;
   type NE = crate::provider::Bn256EngineKZG;
@@ -497,23 +498,29 @@ mod tests {
     // eval = 28
     let eval = Fr::from(28);
 
-    let ck: CommitmentKey<NE> =
-      <KZGCommitmentEngine<E> as CommitmentEngineTrait<NE>>::setup(b"test", n);
-    let (pk, vk): (KZGProverKey<E>, KZGVerifierKey<E>) = EvaluationEngine::<E, NE>::setup(&ck);
+    let ck = <KZGCommitmentEngine<Bn256> as CommitmentEngineTrait<NE>>::setup(b"test", n);
+    let (pk, vk) = EvaluationEngine::<Bn256, NE>::setup(&ck);
 
     // make a commitment
-    let C = KZGCommitmentEngine::commit(&ck, &poly);
+    let C = <KZGCommitmentEngine<Bn256> as CommitmentEngineTrait<NE>>::commit(&ck, &poly);
 
     // prove an evaluation
     let mut prover_transcript = Keccak256Transcript::new(b"TestEval");
-    let proof =
-      EvaluationEngine::<E, NE>::prove(&ck, &pk, &mut prover_transcript, &C, &poly, &point, &eval)
-        .unwrap();
+    let proof = EvaluationEngine::<Bn256, NE>::prove(
+      &ck,
+      &pk,
+      &mut prover_transcript,
+      &C,
+      &poly,
+      &point,
+      &eval,
+    )
+    .unwrap();
     let post_c_p = prover_transcript.squeeze(b"c").unwrap();
 
     // verify the evaluation
     let mut verifier_transcript = Keccak256Transcript::<NE>::new(b"TestEval");
-    assert!(EvaluationEngine::<E, NE>::verify(
+    assert!(EvaluationEngine::<Bn256, NE>::verify(
       &vk,
       &mut verifier_transcript,
       &C,
@@ -536,9 +543,9 @@ mod tests {
 
     // Change the proof and expect verification to fail
     let mut bad_proof = proof.clone();
-    bad_proof.comms[0] = (bad_proof.comms[0] + bad_proof.comms[0] * Fr::from(123)).to_affine();
+    bad_proof.evals[0] = bad_proof.evals[1].clone();
     let mut verifier_transcript2 = Keccak256Transcript::<NE>::new(b"TestEval");
-    assert!(EvaluationEngine::<E, NE>::verify(
+    assert!(EvaluationEngine::<Bn256, NE>::verify(
       &vk,
       &mut verifier_transcript2,
       &C,

src/provider/non_hiding_zeromorph.rs

@@ -595,10 +595,9 @@ mod test {
   use crate::{
     provider::{
       non_hiding_zeromorph::UVKZGPoly,
-      non_hiding_zeromorph::{
-        batched_lifted_degree_quotient, eval_and_quotient_scalars, ZMPCS,
-      },
-      test_utils::prove_verify_from_num_vars, Bn256EngineZM,
+      non_hiding_zeromorph::{batched_lifted_degree_quotient, eval_and_quotient_scalars, ZMPCS},
+      test_utils::prove_verify_from_num_vars,
+      Bn256EngineZM,
     },
     spartan::polys::multilinear::MultilinearPolynomial,
   };

src/spartan/direct.rs

@@ -167,9 +167,9 @@ mod tests {
   use super::*;
   use crate::provider::{Bn256EngineKZG, PallasEngine, Secp256k1Engine};
   use ::bellpepper_core::{num::AllocatedNum, ConstraintSystem, SynthesisError};
-use halo2curves::bn256::Bn256;
   use core::marker::PhantomData;
   use ff::PrimeField;
+  use halo2curves::bn256::Bn256;
 
   #[derive(Clone, Debug, Default)]
   struct CubicCircuit<F: PrimeField> {