refactor: rename bn254_grumpkin -> bn256_grumpkin

src/bellperson/mod.rs

@@ -63,6 +63,6 @@ mod tests {
   #[test]
   fn test_alloc_bit() {
     test_alloc_bit_with::<pasta_curves::pallas::Point>();
-    test_alloc_bit_with::<crate::provider::bn254_grumpkin::bn256::Point>();
+    test_alloc_bit_with::<crate::provider::bn256_grumpkin::bn256::Point>();
   }
 }

src/circuit.rs

@@ -487,14 +487,14 @@ mod tests {
   fn test_recursive_circuit_grumpkin() {
     let params1 = NovaAugmentedCircuitParams::new(BN_LIMB_WIDTH, BN_N_LIMBS, true);
     let params2 = NovaAugmentedCircuitParams::new(BN_LIMB_WIDTH, BN_N_LIMBS, false);
-    let ro_consts1: ROConstantsCircuit<provider::bn254_grumpkin::grumpkin::Point> =
+    let ro_consts1: ROConstantsCircuit<provider::bn256_grumpkin::grumpkin::Point> =
       PoseidonConstantsCircuit::new();
-    let ro_consts2: ROConstantsCircuit<provider::bn254_grumpkin::bn256::Point> =
+    let ro_consts2: ROConstantsCircuit<provider::bn256_grumpkin::bn256::Point> =
       PoseidonConstantsCircuit::new();
 
     test_recursive_circuit_with::<
-      provider::bn254_grumpkin::bn256::Point,
-      provider::bn254_grumpkin::grumpkin::Point,
+      provider::bn256_grumpkin::bn256::Point,
+      provider::bn256_grumpkin::grumpkin::Point,
     >(params1, params2, ro_consts1, ro_consts2, 9983, 10536);
   }
 }

src/gadgets/ecc.rs

@@ -754,7 +754,7 @@ mod tests {
     r1cs::{NovaShape, NovaWitness},
     {shape_cs::ShapeCS, solver::SatisfyingAssignment},
   };
-  use crate::provider::bn254_grumpkin::{bn256, grumpkin};
+  use crate::provider::bn256_grumpkin::{bn256, grumpkin};
   use ff::{Field, PrimeFieldBits};
   use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas, vesta};
   use rand::rngs::OsRng;

src/lib.rs

@@ -793,7 +793,7 @@ fn compute_digest<G: Group, T: Serialize>(o: &T) -> G::Scalar {
 
 #[cfg(test)]
 mod tests {
-  use crate::provider::bn254_grumpkin::{bn256, grumpkin};
+  use crate::provider::bn256_grumpkin::{bn256, grumpkin};
   use crate::provider::pedersen::CommitmentKeyExtTrait;
 
   use super::*;

src/nifs.rs

@@ -211,7 +211,7 @@ mod tests {
   fn test_tiny_r1cs_bellperson() {
     test_tiny_r1cs_bellperson_with::<G>();
 
-    test_tiny_r1cs_bellperson_with::<crate::provider::bn254_grumpkin::bn256::Point>();
+    test_tiny_r1cs_bellperson_with::<crate::provider::bn256_grumpkin::bn256::Point>();
   }
 
   #[allow(clippy::too_many_arguments)]
@@ -386,6 +386,6 @@ mod tests {
   #[test]
   fn test_tiny_r1cs() {
     test_tiny_r1cs_with::<pasta_curves::pallas::Point>();
-    test_tiny_r1cs_with::<crate::provider::bn254_grumpkin::bn256::Point>();
+    test_tiny_r1cs_with::<crate::provider::bn256_grumpkin::bn256::Point>();
   }
 }

src/provider/bn254_grumpkin.rs → src/provider/bn256_grumpkin.rs

@@ -306,6 +306,8 @@ fn cpu_multiexp_serial<C: CurveAffine>(coeffs: &[C::Scalar], bases: &[C], acc: &
 ///
 /// This will use multithreading if beneficial.
 /// Adapted from zcash/halo2
+// TODO: update once https://github.com/privacy-scaling-explorations/halo2curves/pull/29
+// (or a successor thereof) is merged
 fn cpu_best_multiexp<C: CurveAffine>(coeffs: &[C::Scalar], bases: &[C]) -> C::Curve {
   assert_eq!(coeffs.len(), bases.len());
 

src/provider/keccak.rs

@@ -95,7 +95,7 @@ impl<G: Group> TranscriptEngineTrait<G> for Keccak256Transcript<G> {
 #[cfg(test)]
 mod tests {
   use crate::{
-    provider::bn254_grumpkin::bn256,
+    provider::bn256_grumpkin::bn256,
     provider::keccak::Keccak256Transcript,
     traits::{Group, TranscriptEngineTrait},
   };

src/provider/mod.rs

@@ -4,7 +4,7 @@
 //! `RO` traits with Poseidon
 //! `EvaluationEngine` with an IPA-based polynomial evaluation argument
 
-pub mod bn254_grumpkin;
+pub mod bn256_grumpkin;
 pub mod ipa_pc;
 pub mod keccak;
 pub mod pasta;

src/provider/poseidon.rs

@@ -201,7 +201,7 @@ where
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::provider::bn254_grumpkin::bn256;
+  use crate::provider::bn256_grumpkin::bn256;
   use crate::{
     bellperson::solver::SatisfyingAssignment, constants::NUM_CHALLENGE_BITS,
     gadgets::utils::le_bits_to_num, traits::Group,

src/spartan/pp.rs

@@ -2185,7 +2185,7 @@ impl<G: Group, EE: EvaluationEngineTrait<G, CE = G::CE>, C: StepCircuit<G::Scala
 #[cfg(test)]
 mod tests {
   use super::*;
-  use crate::provider::bn254_grumpkin::bn256;
+  use crate::provider::bn256_grumpkin::bn256;
   use ::bellperson::{gadgets::num::AllocatedNum, ConstraintSystem, SynthesisError};
   use core::marker::PhantomData;
   use ff::PrimeField;