refactor: move the halo2_common::arithmetic to halo2_backend(post fe-be split)

Cargo.toml

@@ -7,3 +7,4 @@ members = [
     "halo2_backend",
     "halo2_common",
 ]
+resolver = "2"

halo2_common/src/arithmetic.rs → halo2_backend/src/arithmetic.rs

@@ -1,11 +1,11 @@
 //! This module provides common utilities, traits and structures for group,
 //! field and polynomial arithmetic.
 
-use super::multicore;
 use group::{
     ff::{BatchInvert, PrimeField},
     Curve, Group, GroupOpsOwned, ScalarMulOwned,
 };
+use halo2_common::multicore;
 pub use halo2_middleware::ff::Field;
 
 pub use halo2curves::{CurveAffine, CurveExt};
@@ -89,7 +89,7 @@ fn multiexp_serial<C: CurveAffine>(coeffs: &[C::Scalar], bases: &[C], acc: &mut
                         other += a;
                         other
                     }
-                    Bucket::Projective(a) => other + &a,
+                    Bucket::Projective(a) => other + a,
                 }
             }
         }
@@ -531,7 +531,7 @@ pub fn powers<F: Field>(base: F) -> impl Iterator<Item = F> {
 use rand_core::OsRng;
 
 #[cfg(test)]
-use crate::halo2curves::pasta::Fp;
+use halo2curves::pasta::Fp;
 
 #[test]
 fn test_lagrange_interpolate() {

halo2_backend/src/lib.rs

@@ -1,9 +1,9 @@
+pub mod arithmetic;
 mod helpers;
 pub mod plonk;
 pub mod poly;
 
 // Internal re-exports
-pub use halo2_common::arithmetic;
 pub use halo2_common::circuit;
 pub use halo2_common::multicore;
 pub use halo2_common::transcript;

halo2_backend/src/plonk.rs

@@ -1,6 +1,7 @@
 use blake2b_simd::Params as Blake2bParams;
 use group::ff::{Field, FromUniformBytes, PrimeField};
 
+use crate::arithmetic::CurveAffine;
 use crate::helpers::{
     self, polynomial_slice_byte_length, read_polynomial_vec, write_polynomial_slice,
     SerdeCurveAffine, SerdePrimeField,
@@ -10,7 +11,6 @@ use crate::poly::{
     Polynomial,
 };
 use evaluation::Evaluator;
-use halo2_common::arithmetic::CurveAffine;
 use halo2_common::plonk::{Circuit, ConstraintSystem, PinnedConstraintSystem};
 use halo2_common::transcript::{EncodedChallenge, Transcript};
 use halo2_common::SerdeFormat;

halo2_backend/src/plonk/prover.rs

@@ -4,6 +4,7 @@ use rand_core::RngCore;
 use std::collections::{BTreeSet, HashSet};
 use std::{collections::HashMap, iter};
 
+use crate::arithmetic::{eval_polynomial, CurveAffine};
 use crate::plonk::lookup::prover::lookup_commit_permuted;
 use crate::plonk::permutation::prover::permutation_commit;
 use crate::plonk::shuffle::prover::shuffle_commit_product;
@@ -12,12 +13,11 @@ use crate::poly::{
     commitment::{Blind, CommitmentScheme, Params, Prover},
     Basis, Coeff, LagrangeCoeff, Polynomial, ProverQuery,
 };
+
+use group::prime::PrimeCurveAffine;
 use halo2_common::plonk::{
     circuit::sealed, ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, ChallengeY, Error,
 };
-
-use group::prime::PrimeCurveAffine;
-use halo2_common::arithmetic::{eval_polynomial, CurveAffine};
 use halo2_common::transcript::{EncodedChallenge, TranscriptWrite};
 
 /// Collection of instance data used during proving for a single circuit proof.

halo2_common/src/lib.rs

@@ -6,7 +6,6 @@
 #![deny(rustdoc::broken_intra_doc_links)]
 #![deny(unsafe_code)]
 
-pub mod arithmetic;
 pub mod circuit;
 pub use halo2curves;
 pub mod multicore;

halo2_common/src/plonk.rs

@@ -5,7 +5,6 @@
 //! [halo]: https://eprint.iacr.org/2019/1021
 //! [plonk]: https://eprint.iacr.org/2019/953
 
-use crate::plonk::circuit::Column;
 use crate::transcript::ChallengeScalar;
 use halo2_middleware::circuit::{Advice, Fixed, Instance};
 use halo2_middleware::ff::Field;

halo2_frontend/src/circuit.rs

@@ -76,7 +76,7 @@ pub fn compile_circuit<F: Field, ConcreteCircuit: Circuit<F>>(
         let selectors = std::mem::take(&mut assembly.selectors);
         cs.directly_convert_selectors_to_fixed(selectors)
     };
-    fixed.extend(selector_polys.into_iter());
+    fixed.extend(selector_polys);
 
     let preprocessing = PreprocessingV2 {
         permutation: halo2_middleware::permutation::AssemblyMid {

halo2_frontend/src/circuit/floor_planner.rs

@@ -1,4 +1,4 @@
-mod single_pass;
-mod v1;
+pub mod single_pass;
+pub mod v1;
 
 pub use halo2_common::circuit::floor_planner::*;

halo2_proofs/src/lib.rs

@@ -20,10 +20,10 @@ pub mod circuit {
         AssignedCell, Cell, Chip, Layouter, Region, SimpleFloorPlanner, Value,
     };
 }
-///! This module provides common utilities, traits and structures for group,
-///! field and polynomial arithmetic.
+/// This module provides common utilities, traits and structures for group,
+/// field and polynomial arithmetic.
 pub mod arithmetic {
-    pub use halo2_common::arithmetic::{
+    pub use halo2_backend::arithmetic::{
         best_fft, parallelize, small_multiexp, CurveAffine, CurveExt, Field,
     };
 }

rust-toolchain

@@ -1 +1 @@
-1.67.0
+1.73.0