From 3346d3f902b6b71eeef58e1dab17e2d5b8c956d6 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 27 Jun 2022 12:24:09 -0700 Subject: [PATCH] `field_types` -> `types` (#583) * `field_types` -> `types` Here too, I think "field" is usually clear from context, e.g. in `use plonky2::field::types::Field;`. * fixes * fmt --- ecdsa/src/curve/curve_adds.rs | 2 +- ecdsa/src/curve/curve_msm.rs | 8 ++++---- ecdsa/src/curve/curve_multiplication.rs | 4 ++-- ecdsa/src/curve/curve_summation.rs | 2 +- ecdsa/src/curve/curve_types.rs | 2 +- ecdsa/src/curve/ecdsa.rs | 4 ++-- ecdsa/src/curve/glv.rs | 4 ++-- ecdsa/src/curve/secp256k1.rs | 6 +++--- ecdsa/src/gadgets/biguint.rs | 2 +- ecdsa/src/gadgets/curve.rs | 4 ++-- ecdsa/src/gadgets/curve_fixed_base.rs | 6 +++--- ecdsa/src/gadgets/curve_msm.rs | 4 ++-- ecdsa/src/gadgets/curve_windowed_mul.rs | 4 ++-- ecdsa/src/gadgets/ecdsa.rs | 2 +- ecdsa/src/gadgets/glv.rs | 4 ++-- ecdsa/src/gadgets/nonnative.rs | 6 +++--- ecdsa/src/gadgets/split_nonnative.rs | 4 ++-- evm/src/all_stark.rs | 4 ++-- evm/src/cpu/cpu_stark.rs | 2 +- evm/src/cpu/decode.rs | 2 +- evm/src/cpu/simple_logic/not.rs | 2 +- evm/src/cross_table_lookup.rs | 2 +- evm/src/keccak/keccak_stark.rs | 4 ++-- evm/src/keccak/logic.rs | 2 +- evm/src/keccak/registers.rs | 2 +- evm/src/keccak/round_flags.rs | 2 +- evm/src/logic.rs | 2 +- evm/src/lookup.rs | 2 +- evm/src/memory/memory_stark.rs | 2 +- evm/src/permutation.rs | 2 +- evm/src/prover.rs | 2 +- evm/src/recursive_verifier.rs | 2 +- evm/src/stark.rs | 2 +- evm/src/stark_testing.rs | 2 +- evm/src/util.rs | 2 +- evm/src/vars.rs | 2 +- evm/src/verifier.rs | 4 ++-- field/src/arch/x86_64/avx2_goldilocks_field.rs | 4 ++-- field/src/arch/x86_64/avx512_goldilocks_field.rs | 4 ++-- field/src/batch_util.rs | 2 +- field/src/cosets.rs | 4 ++-- field/src/extension/algebra.rs | 2 +- field/src/extension/mod.rs | 2 +- field/src/extension/quadratic.rs | 2 +- field/src/extension/quartic.rs | 2 +- field/src/extension/quintic.rs | 2 +- field/src/fft.rs | 4 ++-- field/src/field_testing.rs | 4 ++-- field/src/goldilocks_extensions.rs | 2 +- field/src/goldilocks_field.rs | 2 +- field/src/interpolation.rs | 4 ++-- field/src/inversion.rs | 2 +- field/src/lib.rs | 2 +- field/src/packable.rs | 2 +- field/src/packed_field.rs | 2 +- field/src/polynomial/division.rs | 4 ++-- field/src/polynomial/mod.rs | 2 +- field/src/prime_field_testing.rs | 4 ++-- field/src/secp256k1_base.rs | 2 +- field/src/secp256k1_scalar.rs | 2 +- field/src/{field_types.rs => types.rs} | 0 field/src/zero_poly_coset.rs | 2 +- insertion/src/insert_gadget.rs | 2 +- insertion/src/insertion_gate.rs | 4 ++-- plonky2/benches/ffts.rs | 2 +- plonky2/benches/field_arithmetic.rs | 2 +- plonky2/benches/reverse_index_bits.rs | 2 +- plonky2/benches/transpose.rs | 2 +- plonky2/src/bin/generate_constants.rs | 2 +- plonky2/src/fri/oracle.rs | 2 +- plonky2/src/fri/verifier.rs | 2 +- plonky2/src/gadgets/arithmetic.rs | 2 +- plonky2/src/gadgets/arithmetic_extension.rs | 4 ++-- plonky2/src/gadgets/interpolation.rs | 2 +- plonky2/src/gadgets/random_access.rs | 2 +- plonky2/src/gadgets/select.rs | 2 +- plonky2/src/gadgets/split_base.rs | 4 ++-- plonky2/src/gates/assert_le.rs | 6 +++--- plonky2/src/gates/base_sum.rs | 2 +- plonky2/src/gates/exponentiation.rs | 4 ++-- plonky2/src/gates/gate.rs | 2 +- plonky2/src/gates/gate_testing.rs | 2 +- plonky2/src/gates/interpolation.rs | 2 +- plonky2/src/gates/low_degree_interpolation.rs | 4 ++-- plonky2/src/gates/poseidon.rs | 4 ++-- plonky2/src/gates/poseidon_mds.rs | 2 +- plonky2/src/gates/random_access.rs | 4 ++-- .../src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs | 2 +- plonky2/src/hash/hash_types.rs | 2 +- plonky2/src/hash/merkle_proofs.rs | 2 +- plonky2/src/hash/path_compression.rs | 2 +- plonky2/src/hash/poseidon.rs | 4 ++-- plonky2/src/hash/poseidon_goldilocks.rs | 4 ++-- plonky2/src/iop/challenger.rs | 2 +- plonky2/src/iop/ext_target.rs | 2 +- plonky2/src/iop/generator.rs | 2 +- plonky2/src/iop/witness.rs | 2 +- plonky2/src/plonk/circuit_builder.rs | 2 +- plonky2/src/plonk/circuit_data.rs | 2 +- plonky2/src/plonk/permutation_argument.rs | 2 +- plonky2/src/plonk/plonk_common.rs | 2 +- plonky2/src/plonk/proof.rs | 2 +- plonky2/src/plonk/prover.rs | 2 +- plonky2/src/plonk/vanishing_poly.rs | 2 +- plonky2/src/plonk/vars.rs | 2 +- plonky2/src/plonk/verifier.rs | 2 +- plonky2/src/util/mod.rs | 2 +- plonky2/src/util/partial_products.rs | 2 +- plonky2/src/util/reducing.rs | 2 +- plonky2/src/util/serialization.rs | 2 +- starky/src/fibonacci_stark.rs | 2 +- starky/src/permutation.rs | 2 +- starky/src/prover.rs | 2 +- starky/src/recursive_verifier.rs | 2 +- starky/src/stark_testing.rs | 2 +- starky/src/util.rs | 2 +- starky/src/vars.rs | 2 +- starky/src/verifier.rs | 4 ++-- system_zero/benches/lookup_permuted_cols.rs | 2 +- system_zero/src/alu/addition.rs | 2 +- system_zero/src/alu/bitops.rs | 4 ++-- system_zero/src/alu/canonical.rs | 2 +- system_zero/src/alu/division.rs | 4 ++-- system_zero/src/alu/mod.rs | 2 +- system_zero/src/alu/mul_add.rs | 2 +- system_zero/src/alu/rotate_shift.rs | 2 +- system_zero/src/alu/subtraction.rs | 2 +- system_zero/src/core_registers.rs | 2 +- system_zero/src/lookup.rs | 2 +- system_zero/src/permutation_unit.rs | 2 +- system_zero/src/system_zero.rs | 2 +- u32/src/gadgets/multiple_comparison.rs | 2 +- u32/src/gates/add_many_u32.rs | 4 ++-- u32/src/gates/arithmetic_u32.rs | 4 ++-- u32/src/gates/comparison.rs | 6 +++--- u32/src/gates/range_check_u32.rs | 4 ++-- u32/src/gates/subtraction_u32.rs | 6 +++--- u32/src/witness.rs | 2 +- waksman/src/gates/switch.rs | 4 ++-- waksman/src/permutation.rs | 4 ++-- waksman/src/sorting.rs | 4 ++-- 141 files changed, 192 insertions(+), 192 deletions(-) rename field/src/{field_types.rs => types.rs} (100%) diff --git a/ecdsa/src/curve/curve_adds.rs b/ecdsa/src/curve/curve_adds.rs index 98dbc697..05d9d515 100644 --- a/ecdsa/src/curve/curve_adds.rs +++ b/ecdsa/src/curve/curve_adds.rs @@ -1,7 +1,7 @@ use std::ops::Add; -use plonky2_field::field_types::Field; use plonky2_field::ops::Square; +use plonky2_field::types::Field; use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint}; diff --git a/ecdsa/src/curve/curve_msm.rs b/ecdsa/src/curve/curve_msm.rs index 4c274c1c..6d07c097 100644 --- a/ecdsa/src/curve/curve_msm.rs +++ b/ecdsa/src/curve/curve_msm.rs @@ -1,6 +1,6 @@ use itertools::Itertools; -use plonky2_field::field_types::Field; -use plonky2_field::field_types::PrimeField; +use plonky2_field::types::Field; +use plonky2_field::types::PrimeField; use rayon::prelude::*; use crate::curve::curve_summation::affine_multisummation_best; @@ -187,9 +187,9 @@ pub(crate) fn to_digits(x: &C::ScalarField, w: usize) -> Vec { #[cfg(test)] mod tests { use num::BigUint; - use plonky2_field::field_types::Field; - use plonky2_field::field_types::PrimeField; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; + use plonky2_field::types::PrimeField; use crate::curve::curve_msm::{msm_execute, msm_precompute, to_digits}; use crate::curve::curve_types::Curve; diff --git a/ecdsa/src/curve/curve_multiplication.rs b/ecdsa/src/curve/curve_multiplication.rs index 9f2accaf..70e49df6 100644 --- a/ecdsa/src/curve/curve_multiplication.rs +++ b/ecdsa/src/curve/curve_multiplication.rs @@ -1,7 +1,7 @@ use std::ops::Mul; -use plonky2_field::field_types::Field; -use plonky2_field::field_types::PrimeField; +use plonky2_field::types::Field; +use plonky2_field::types::PrimeField; use crate::curve::curve_types::{Curve, CurveScalar, ProjectivePoint}; diff --git a/ecdsa/src/curve/curve_summation.rs b/ecdsa/src/curve/curve_summation.rs index 7ea01524..492d7722 100644 --- a/ecdsa/src/curve/curve_summation.rs +++ b/ecdsa/src/curve/curve_summation.rs @@ -1,7 +1,7 @@ use std::iter::Sum; -use plonky2_field::field_types::Field; use plonky2_field::ops::Square; +use plonky2_field::types::Field; use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint}; diff --git a/ecdsa/src/curve/curve_types.rs b/ecdsa/src/curve/curve_types.rs index be025e12..bbf66d65 100644 --- a/ecdsa/src/curve/curve_types.rs +++ b/ecdsa/src/curve/curve_types.rs @@ -2,8 +2,8 @@ use std::fmt::Debug; use std::hash::Hash; use std::ops::Neg; -use plonky2_field::field_types::{Field, PrimeField}; use plonky2_field::ops::Square; +use plonky2_field::types::{Field, PrimeField}; use serde::{Deserialize, Serialize}; // To avoid implementation conflicts from associated types, diff --git a/ecdsa/src/curve/ecdsa.rs b/ecdsa/src/curve/ecdsa.rs index bb4ebe4a..0b2d396d 100644 --- a/ecdsa/src/curve/ecdsa.rs +++ b/ecdsa/src/curve/ecdsa.rs @@ -1,4 +1,4 @@ -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use serde::{Deserialize, Serialize}; use crate::curve::curve_msm::msm_parallel; @@ -63,8 +63,8 @@ pub fn verify_message( #[cfg(test)] mod tests { - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::curve::ecdsa::{sign_message, verify_message, ECDSASecretKey}; use crate::curve::secp256k1::Secp256K1; diff --git a/ecdsa/src/curve/glv.rs b/ecdsa/src/curve/glv.rs index 8859d904..05ecea44 100644 --- a/ecdsa/src/curve/glv.rs +++ b/ecdsa/src/curve/glv.rs @@ -1,8 +1,8 @@ use num::rational::Ratio; use num::BigUint; -use plonky2_field::field_types::{Field, PrimeField}; use plonky2_field::secp256k1_base::Secp256K1Base; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; +use plonky2_field::types::{Field, PrimeField}; use crate::curve::curve_msm::msm_parallel; use crate::curve::curve_types::{AffinePoint, ProjectivePoint}; @@ -102,8 +102,8 @@ pub fn glv_mul(p: ProjectivePoint, k: Secp256K1Scalar) -> ProjectiveP #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::curve::curve_types::{Curve, CurveScalar}; use crate::curve::glv::{decompose_secp256k1_scalar, glv_mul, GLV_S}; diff --git a/ecdsa/src/curve/secp256k1.rs b/ecdsa/src/curve/secp256k1.rs index 18040dae..e46fbb3d 100644 --- a/ecdsa/src/curve/secp256k1.rs +++ b/ecdsa/src/curve/secp256k1.rs @@ -1,6 +1,6 @@ -use plonky2_field::field_types::Field; use plonky2_field::secp256k1_base::Secp256K1Base; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; +use plonky2_field::types::Field; use serde::{Deserialize, Serialize}; use crate::curve::curve_types::{AffinePoint, Curve}; @@ -40,9 +40,9 @@ const SECP256K1_GENERATOR_Y: Secp256K1Base = Secp256K1Base([ #[cfg(test)] mod tests { use num::BigUint; - use plonky2_field::field_types::Field; - use plonky2_field::field_types::PrimeField; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; + use plonky2_field::types::PrimeField; use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint}; use crate::curve::secp256k1::Secp256K1; diff --git a/ecdsa/src/gadgets/biguint.rs b/ecdsa/src/gadgets/biguint.rs index 6dfd39a6..1dbe4657 100644 --- a/ecdsa/src/gadgets/biguint.rs +++ b/ecdsa/src/gadgets/biguint.rs @@ -7,7 +7,7 @@ use plonky2::iop::target::{BoolTarget, Target}; use plonky2::iop::witness::{PartitionWitness, Witness}; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::PrimeField; +use plonky2_field::types::PrimeField; use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target}; use plonky2_u32::gadgets::multiple_comparison::list_le_u32_circuit; use plonky2_u32::witness::{generated_values_set_u32_target, witness_set_u32_target}; diff --git a/ecdsa/src/gadgets/curve.rs b/ecdsa/src/gadgets/curve.rs index 1959d54a..4aa69733 100644 --- a/ecdsa/src/gadgets/curve.rs +++ b/ecdsa/src/gadgets/curve.rs @@ -2,7 +2,7 @@ use plonky2::hash::hash_types::RichField; use plonky2::iop::target::BoolTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar}; use crate::gadgets::nonnative::{CircuitBuilderNonNative, NonNativeTarget}; @@ -261,9 +261,9 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_base::Secp256K1Base; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar}; use crate::curve::secp256k1::Secp256K1; diff --git a/ecdsa/src/gadgets/curve_fixed_base.rs b/ecdsa/src/gadgets/curve_fixed_base.rs index 02ed458a..8d675d12 100644 --- a/ecdsa/src/gadgets/curve_fixed_base.rs +++ b/ecdsa/src/gadgets/curve_fixed_base.rs @@ -4,7 +4,7 @@ use plonky2::hash::keccak::KeccakHash; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::config::{GenericHashOut, Hasher}; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar}; use crate::gadgets::curve::{AffinePointTarget, CircuitBuilderCurve}; @@ -66,9 +66,9 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; - use plonky2_field::field_types::PrimeField; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; + use plonky2_field::types::PrimeField; use crate::curve::curve_types::{Curve, CurveScalar}; use crate::curve::secp256k1::Secp256K1; diff --git a/ecdsa/src/gadgets/curve_msm.rs b/ecdsa/src/gadgets/curve_msm.rs index fb768b6e..1265d399 100644 --- a/ecdsa/src/gadgets/curve_msm.rs +++ b/ecdsa/src/gadgets/curve_msm.rs @@ -4,7 +4,7 @@ use plonky2::hash::keccak::KeccakHash; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::config::{GenericHashOut, Hasher}; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::curve::curve_types::{Curve, CurveScalar}; use crate::gadgets::curve::{AffinePointTarget, CircuitBuilderCurve}; @@ -83,8 +83,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::curve::curve_types::{Curve, CurveScalar}; use crate::curve::secp256k1::Secp256K1; diff --git a/ecdsa/src/gadgets/curve_windowed_mul.rs b/ecdsa/src/gadgets/curve_windowed_mul.rs index 0113b5ee..d9dcc734 100644 --- a/ecdsa/src/gadgets/curve_windowed_mul.rs +++ b/ecdsa/src/gadgets/curve_windowed_mul.rs @@ -7,7 +7,7 @@ use plonky2::iop::target::{BoolTarget, Target}; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::config::{GenericHashOut, Hasher}; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target}; use crate::curve::curve_types::{Curve, CurveScalar}; @@ -176,8 +176,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use rand::Rng; use crate::curve::curve_types::{Curve, CurveScalar}; diff --git a/ecdsa/src/gadgets/ecdsa.rs b/ecdsa/src/gadgets/ecdsa.rs index c8fae72c..b287ff05 100644 --- a/ecdsa/src/gadgets/ecdsa.rs +++ b/ecdsa/src/gadgets/ecdsa.rs @@ -56,8 +56,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use super::{ECDSAPublicKeyTarget, ECDSASignatureTarget}; use crate::curve::curve_types::{Curve, CurveScalar}; diff --git a/ecdsa/src/gadgets/glv.rs b/ecdsa/src/gadgets/glv.rs index fd1ce0e6..746d661f 100644 --- a/ecdsa/src/gadgets/glv.rs +++ b/ecdsa/src/gadgets/glv.rs @@ -6,9 +6,9 @@ use plonky2::iop::target::{BoolTarget, Target}; use plonky2::iop::witness::PartitionWitness; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::{Field, PrimeField}; use plonky2_field::secp256k1_base::Secp256K1Base; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; +use plonky2_field::types::{Field, PrimeField}; use crate::curve::glv::{decompose_secp256k1_scalar, GLV_BETA, GLV_S}; use crate::curve::secp256k1::Secp256K1; @@ -137,8 +137,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::curve::curve_types::{Curve, CurveScalar}; use crate::curve::glv::glv_mul; diff --git a/ecdsa/src/gadgets/nonnative.rs b/ecdsa/src/gadgets/nonnative.rs index 46f0f335..3c2e2ed6 100644 --- a/ecdsa/src/gadgets/nonnative.rs +++ b/ecdsa/src/gadgets/nonnative.rs @@ -6,8 +6,8 @@ use plonky2::iop::generator::{GeneratedValues, SimpleGenerator}; use plonky2::iop::target::{BoolTarget, Target}; use plonky2::iop::witness::PartitionWitness; use plonky2::plonk::circuit_builder::CircuitBuilder; -use plonky2_field::field_types::PrimeField; -use plonky2_field::{extension::Extendable, field_types::Field}; +use plonky2_field::types::PrimeField; +use plonky2_field::{extension::Extendable, types::Field}; use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target}; use plonky2_u32::gadgets::range_check::range_check_u32_circuit; use plonky2_u32::witness::generated_values_set_u32_target; @@ -646,8 +646,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::{Field, PrimeField}; use plonky2_field::secp256k1_base::Secp256K1Base; + use plonky2_field::types::{Field, PrimeField}; use crate::gadgets::nonnative::CircuitBuilderNonNative; diff --git a/ecdsa/src/gadgets/split_nonnative.rs b/ecdsa/src/gadgets/split_nonnative.rs index bfcff487..5ee3a864 100644 --- a/ecdsa/src/gadgets/split_nonnative.rs +++ b/ecdsa/src/gadgets/split_nonnative.rs @@ -5,7 +5,7 @@ use plonky2::hash::hash_types::RichField; use plonky2::iop::target::Target; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target}; use crate::gadgets::biguint::BigUintTarget; @@ -100,8 +100,8 @@ mod tests { use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; - use plonky2_field::field_types::Field; use plonky2_field::secp256k1_scalar::Secp256K1Scalar; + use plonky2_field::types::Field; use crate::gadgets::nonnative::{CircuitBuilderNonNative, NonNativeTarget}; use crate::gadgets::split_nonnative::CircuitBuilderSplit; diff --git a/evm/src/all_stark.rs b/evm/src/all_stark.rs index 345ac56b..052b9990 100644 --- a/evm/src/all_stark.rs +++ b/evm/src/all_stark.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use crate::config::StarkConfig; @@ -117,8 +117,8 @@ fn ctl_memory(channel: usize) -> CrossTableLookup { mod tests { use anyhow::Result; use itertools::{izip, Itertools}; - use plonky2::field::field_types::Field; use plonky2::field::polynomial::PolynomialValues; + use plonky2::field::types::Field; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::circuit_data::CircuitConfig; diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs index 8277a2fe..3c8b3d48 100644 --- a/evm/src/cpu/cpu_stark.rs +++ b/evm/src/cpu/cpu_stark.rs @@ -2,8 +2,8 @@ use std::marker::PhantomData; use itertools::Itertools; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer}; diff --git a/evm/src/cpu/decode.rs b/evm/src/cpu/decode.rs index 0bbac969..735494f0 100644 --- a/evm/src/cpu/decode.rs +++ b/evm/src/cpu/decode.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/evm/src/cpu/simple_logic/not.rs b/evm/src/cpu/simple_logic/not.rs index f4c15e0f..b52b2132 100644 --- a/evm/src/cpu/simple_logic/not.rs +++ b/evm/src/cpu/simple_logic/not.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/evm/src/cross_table_lookup.rs b/evm/src/cross_table_lookup.rs index 57c1a50a..e968062c 100644 --- a/evm/src/cross_table_lookup.rs +++ b/evm/src/cross_table_lookup.rs @@ -3,9 +3,9 @@ use std::iter::repeat; use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; use plonky2::field::polynomial::PolynomialValues; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::challenger::Challenger; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/evm/src/keccak/keccak_stark.rs b/evm/src/keccak/keccak_stark.rs index efa578d5..41f2aef2 100644 --- a/evm/src/keccak/keccak_stark.rs +++ b/evm/src/keccak/keccak_stark.rs @@ -3,9 +3,9 @@ use std::marker::PhantomData; use itertools::Itertools; use log::info; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; use plonky2::field::polynomial::PolynomialValues; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::plonk::plonk_common::reduce_with_powers_ext_circuit; use plonky2::timed; @@ -526,7 +526,7 @@ impl, const D: usize> Stark for KeccakStark(log_n: usize, x: F) -> (F, F) { #[cfg(test)] mod tests { - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; use plonky2::field::polynomial::PolynomialValues; + use plonky2::field::types::Field; use crate::verifier::eval_l_1_and_l_last; diff --git a/field/src/arch/x86_64/avx2_goldilocks_field.rs b/field/src/arch/x86_64/avx2_goldilocks_field.rs index e185cb4c..e00e0efc 100644 --- a/field/src/arch/x86_64/avx2_goldilocks_field.rs +++ b/field/src/arch/x86_64/avx2_goldilocks_field.rs @@ -5,10 +5,10 @@ use std::iter::{Product, Sum}; use std::mem::transmute; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; -use crate::field_types::{Field, Field64}; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; use crate::packed_field::PackedField; +use crate::types::{Field, Field64}; // Ideally `Avx2GoldilocksField` would wrap `__m256i`. Unfortunately, `__m256i` has an alignment of // 32B, which would preclude us from casting `[GoldilocksField; 4]` (alignment 8B) to @@ -510,10 +510,10 @@ unsafe fn interleave2(x: __m256i, y: __m256i) -> (__m256i, __m256i) { #[cfg(test)] mod tests { use crate::arch::x86_64::avx2_goldilocks_field::Avx2GoldilocksField; - use crate::field_types::Field64; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; use crate::packed_field::PackedField; + use crate::types::Field64; fn test_vals_a() -> [GoldilocksField; 4] { [ diff --git a/field/src/arch/x86_64/avx512_goldilocks_field.rs b/field/src/arch/x86_64/avx512_goldilocks_field.rs index aaa05e93..bd7a9b0a 100644 --- a/field/src/arch/x86_64/avx512_goldilocks_field.rs +++ b/field/src/arch/x86_64/avx512_goldilocks_field.rs @@ -5,10 +5,10 @@ use std::iter::{Product, Sum}; use std::mem::transmute; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; -use crate::field_types::{Field, Field64}; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; use crate::packed_field::PackedField; +use crate::types::{Field, Field64}; // Ideally `Avx512GoldilocksField` would wrap `__m512i`. Unfortunately, `__m512i` has an alignment // of 64B, which would preclude us from casting `[GoldilocksField; 8]` (alignment 8B) to @@ -407,10 +407,10 @@ unsafe fn interleave4(x: __m512i, y: __m512i) -> (__m512i, __m512i) { #[cfg(test)] mod tests { use crate::arch::x86_64::avx512_goldilocks_field::Avx512GoldilocksField; - use crate::field_types::Field64; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; use crate::packed_field::PackedField; + use crate::types::Field64; fn test_vals_a() -> [GoldilocksField; 8] { [ diff --git a/field/src/batch_util.rs b/field/src/batch_util.rs index 11ef0edf..4bc240fc 100644 --- a/field/src/batch_util.rs +++ b/field/src/batch_util.rs @@ -1,6 +1,6 @@ -use crate::field_types::Field; use crate::packable::Packable; use crate::packed_field::PackedField; +use crate::types::Field; fn pack_with_leftovers_split_point(slice: &[P::Scalar]) -> usize { let n = slice.len(); diff --git a/field/src/cosets.rs b/field/src/cosets.rs index 3dcc953f..46b43d90 100644 --- a/field/src/cosets.rs +++ b/field/src/cosets.rs @@ -1,6 +1,6 @@ use num::bigint::BigUint; -use crate::field_types::Field; +use crate::types::Field; /// Finds a set of shifts that result in unique cosets for the multiplicative subgroup of size /// `2^subgroup_bits`. @@ -26,8 +26,8 @@ mod tests { use std::collections::HashSet; use crate::cosets::get_unique_coset_shifts; - use crate::field_types::Field; use crate::goldilocks_field::GoldilocksField; + use crate::types::Field; #[test] fn distinct_cosets() { diff --git a/field/src/extension/algebra.rs b/field/src/extension/algebra.rs index b4d67f91..54bea694 100644 --- a/field/src/extension/algebra.rs +++ b/field/src/extension/algebra.rs @@ -194,8 +194,8 @@ mod tests { use crate::extension::algebra::ExtensionAlgebra; use crate::extension::{Extendable, FieldExtension}; - use crate::field_types::Field; use crate::goldilocks_field::GoldilocksField; + use crate::types::Field; /// Tests that the multiplication on the extension algebra lifts that of the field extension. fn test_extension_algebra, const D: usize>() { diff --git a/field/src/extension/mod.rs b/field/src/extension/mod.rs index 0e2b3f15..f54d669c 100644 --- a/field/src/extension/mod.rs +++ b/field/src/extension/mod.rs @@ -1,6 +1,6 @@ use std::convert::TryInto; -use crate::field_types::Field; +use crate::types::Field; pub mod algebra; pub mod quadratic; diff --git a/field/src/extension/quadratic.rs b/field/src/extension/quadratic.rs index 01ea8b2e..5789ecc1 100644 --- a/field/src/extension/quadratic.rs +++ b/field/src/extension/quadratic.rs @@ -8,8 +8,8 @@ use rand::Rng; use serde::{Deserialize, Serialize}; use crate::extension::{Extendable, FieldExtension, Frobenius, OEF}; -use crate::field_types::Field; use crate::ops::Square; +use crate::types::Field; #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] #[serde(bound = "")] diff --git a/field/src/extension/quartic.rs b/field/src/extension/quartic.rs index 0521a333..ed8006f2 100644 --- a/field/src/extension/quartic.rs +++ b/field/src/extension/quartic.rs @@ -9,8 +9,8 @@ use rand::Rng; use serde::{Deserialize, Serialize}; use crate::extension::{Extendable, FieldExtension, Frobenius, OEF}; -use crate::field_types::Field; use crate::ops::Square; +use crate::types::Field; #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] #[serde(bound = "")] diff --git a/field/src/extension/quintic.rs b/field/src/extension/quintic.rs index fd400986..7a992b7d 100644 --- a/field/src/extension/quintic.rs +++ b/field/src/extension/quintic.rs @@ -8,8 +8,8 @@ use rand::Rng; use serde::{Deserialize, Serialize}; use crate::extension::{Extendable, FieldExtension, Frobenius, OEF}; -use crate::field_types::Field; use crate::ops::Square; +use crate::types::Field; #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)] #[serde(bound = "")] diff --git a/field/src/fft.rs b/field/src/fft.rs index c548d51e..b552001e 100644 --- a/field/src/fft.rs +++ b/field/src/fft.rs @@ -4,10 +4,10 @@ use std::option::Option; use plonky2_util::{log2_strict, reverse_index_bits_in_place}; use unroll::unroll_for_loops; -use crate::field_types::Field; use crate::packable::Packable; use crate::packed_field::PackedField; use crate::polynomial::{PolynomialCoeffs, PolynomialValues}; +use crate::types::Field; pub type FftRootTable = Vec>; @@ -210,9 +210,9 @@ mod tests { use plonky2_util::{log2_ceil, log2_strict}; use crate::fft::{fft, fft_with_options, ifft}; - use crate::field_types::Field; use crate::goldilocks_field::GoldilocksField; use crate::polynomial::{PolynomialCoeffs, PolynomialValues}; + use crate::types::Field; #[test] fn fft_and_ifft() { diff --git a/field/src/field_testing.rs b/field/src/field_testing.rs index cd54b08e..d85ac5e9 100644 --- a/field/src/field_testing.rs +++ b/field/src/field_testing.rs @@ -1,7 +1,7 @@ use crate::extension::Extendable; use crate::extension::Frobenius; -use crate::field_types::Field; use crate::ops::Square; +use crate::types::Field; #[macro_export] macro_rules! test_field_arithmetic { @@ -9,7 +9,7 @@ macro_rules! test_field_arithmetic { mod field_arithmetic { use num::bigint::BigUint; use rand::Rng; - use $crate::field_types::Field; + use $crate::types::Field; #[test] fn batch_inversion() { diff --git a/field/src/goldilocks_extensions.rs b/field/src/goldilocks_extensions.rs index 5bbfd0ab..e684c7cb 100644 --- a/field/src/goldilocks_extensions.rs +++ b/field/src/goldilocks_extensions.rs @@ -6,8 +6,8 @@ use crate::extension::quadratic::QuadraticExtension; use crate::extension::quartic::QuarticExtension; use crate::extension::quintic::QuinticExtension; use crate::extension::{Extendable, Frobenius}; -use crate::field_types::Field; use crate::goldilocks_field::{reduce160, GoldilocksField}; +use crate::types::Field; impl Frobenius<1> for GoldilocksField {} diff --git a/field/src/goldilocks_field.rs b/field/src/goldilocks_field.rs index c3172991..545d515a 100644 --- a/field/src/goldilocks_field.rs +++ b/field/src/goldilocks_field.rs @@ -9,8 +9,8 @@ use plonky2_util::{assume, branch_hint}; use rand::Rng; use serde::{Deserialize, Serialize}; -use crate::field_types::{Field, Field64, PrimeField, PrimeField64}; use crate::inversion::try_inverse_u64; +use crate::types::{Field, Field64, PrimeField, PrimeField64}; const EPSILON: u64 = (1 << 32) - 1; diff --git a/field/src/interpolation.rs b/field/src/interpolation.rs index 7d28303c..d0675715 100644 --- a/field/src/interpolation.rs +++ b/field/src/interpolation.rs @@ -1,8 +1,8 @@ use plonky2_util::log2_ceil; use crate::fft::ifft; -use crate::field_types::Field; use crate::polynomial::{PolynomialCoeffs, PolynomialValues}; +use crate::types::Field; /// Computes the unique degree < n interpolant of an arbitrary list of n (point, value) pairs. /// @@ -79,9 +79,9 @@ pub fn interpolate2(points: [(F, F); 2], x: F) -> F { mod tests { use super::*; use crate::extension::quartic::QuarticExtension; - use crate::field_types::Field; use crate::goldilocks_field::GoldilocksField; use crate::polynomial::PolynomialCoeffs; + use crate::types::Field; #[test] fn interpolant_random() { diff --git a/field/src/inversion.rs b/field/src/inversion.rs index 5eabc45c..740e6562 100644 --- a/field/src/inversion.rs +++ b/field/src/inversion.rs @@ -1,4 +1,4 @@ -use crate::field_types::PrimeField64; +use crate::types::PrimeField64; /// This is a 'safe' iteration for the modular inversion algorithm. It /// is safe in the sense that it will produce the right answer even diff --git a/field/src/lib.rs b/field/src/lib.rs index 4cfdb65c..dd55d09d 100644 --- a/field/src/lib.rs +++ b/field/src/lib.rs @@ -14,7 +14,6 @@ pub mod batch_util; pub mod cosets; pub mod extension; pub mod fft; -pub mod field_types; pub mod goldilocks_extensions; pub mod goldilocks_field; pub mod interpolation; @@ -25,6 +24,7 @@ pub mod packed_field; pub mod polynomial; pub mod secp256k1_base; pub mod secp256k1_scalar; +pub mod types; pub mod zero_poly_coset; #[cfg(test)] diff --git a/field/src/packable.rs b/field/src/packable.rs index 18fe07f7..b1dc4c78 100644 --- a/field/src/packable.rs +++ b/field/src/packable.rs @@ -1,5 +1,5 @@ -use crate::field_types::Field; use crate::packed_field::PackedField; +use crate::types::Field; /// Points us to the default packing for a particular field. There may me multiple choices of /// PackedField for a particular Field (e.g. every Field is also a PackedField), but this is the diff --git a/field/src/packed_field.rs b/field/src/packed_field.rs index bf5fed2d..9708f9e3 100644 --- a/field/src/packed_field.rs +++ b/field/src/packed_field.rs @@ -3,8 +3,8 @@ use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Neg, Sub, SubAssign}; use std::slice; -use crate::field_types::Field; use crate::ops::Square; +use crate::types::Field; /// # Safety /// - WIDTH is assumed to be a power of 2. diff --git a/field/src/polynomial/division.rs b/field/src/polynomial/division.rs index 6ff5f818..561b9661 100644 --- a/field/src/polynomial/division.rs +++ b/field/src/polynomial/division.rs @@ -1,7 +1,7 @@ use plonky2_util::log2_ceil; -use crate::field_types::Field; use crate::polynomial::PolynomialCoeffs; +use crate::types::Field; impl PolynomialCoeffs { /// Polynomial division. @@ -134,9 +134,9 @@ mod tests { use rand::{thread_rng, Rng}; use crate::extension::quartic::QuarticExtension; - use crate::field_types::Field; use crate::goldilocks_field::GoldilocksField; use crate::polynomial::PolynomialCoeffs; + use crate::types::Field; #[test] fn test_division_by_linear() { diff --git a/field/src/polynomial/mod.rs b/field/src/polynomial/mod.rs index c0aaadf1..82c4a41c 100644 --- a/field/src/polynomial/mod.rs +++ b/field/src/polynomial/mod.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use crate::extension::{Extendable, FieldExtension}; use crate::fft::{fft, fft_with_options, ifft, FftRootTable}; -use crate::field_types::Field; +use crate::types::Field; /// A polynomial in point-value form. /// diff --git a/field/src/prime_field_testing.rs b/field/src/prime_field_testing.rs index 8514f9b1..13431265 100644 --- a/field/src/prime_field_testing.rs +++ b/field/src/prime_field_testing.rs @@ -1,4 +1,4 @@ -use crate::field_types::PrimeField64; +use crate::types::PrimeField64; /// Generates a series of non-negative integers less than `modulus` which cover a range of /// interesting test values. @@ -70,8 +70,8 @@ macro_rules! test_prime_field_arithmetic { mod prime_field_arithmetic { use std::ops::{Add, Mul, Neg, Sub}; - use $crate::field_types::{Field, Field64}; use $crate::ops::Square; + use $crate::types::{Field, Field64}; #[test] fn arithmetic_addition() { diff --git a/field/src/secp256k1_base.rs b/field/src/secp256k1_base.rs index 1972aed7..9dd41a5d 100644 --- a/field/src/secp256k1_base.rs +++ b/field/src/secp256k1_base.rs @@ -10,7 +10,7 @@ use num::{Integer, One}; use rand::Rng; use serde::{Deserialize, Serialize}; -use crate::field_types::{Field, PrimeField}; +use crate::types::{Field, PrimeField}; /// The base field of the secp256k1 elliptic curve. /// diff --git a/field/src/secp256k1_scalar.rs b/field/src/secp256k1_scalar.rs index 1e506426..ec1ad19e 100644 --- a/field/src/secp256k1_scalar.rs +++ b/field/src/secp256k1_scalar.rs @@ -11,7 +11,7 @@ use num::{Integer, One}; use rand::Rng; use serde::{Deserialize, Serialize}; -use crate::field_types::{Field, PrimeField}; +use crate::types::{Field, PrimeField}; /// The base field of the secp256k1 elliptic curve. /// diff --git a/field/src/field_types.rs b/field/src/types.rs similarity index 100% rename from field/src/field_types.rs rename to field/src/types.rs diff --git a/field/src/zero_poly_coset.rs b/field/src/zero_poly_coset.rs index f4f6e722..0f5a82a4 100644 --- a/field/src/zero_poly_coset.rs +++ b/field/src/zero_poly_coset.rs @@ -1,5 +1,5 @@ -use crate::field_types::Field; use crate::packed_field::PackedField; +use crate::types::Field; /// Precomputations of the evaluation of `Z_H(X) = X^n - 1` on a coset `gK` with `H <= K`. pub struct ZeroPolyOnCoset { diff --git a/insertion/src/insert_gadget.rs b/insertion/src/insert_gadget.rs index aa0b30e3..ff0ec397 100644 --- a/insertion/src/insert_gadget.rs +++ b/insertion/src/insert_gadget.rs @@ -50,7 +50,7 @@ impl, const D: usize> CircuitBuilderInsert #[cfg(test)] mod tests { use anyhow::Result; - use plonky2::field::field_types::Field; + use plonky2::field::types::Field; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/insertion/src/insertion_gate.rs b/insertion/src/insertion_gate.rs index db36f7e6..ea8f4194 100644 --- a/insertion/src/insertion_gate.rs +++ b/insertion/src/insertion_gate.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use std::ops::Range; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; +use plonky2::field::types::Field; use plonky2::gates::gate::Gate; use plonky2::gates::util::StridedConstraintConsumer; use plonky2::hash::hash_types::RichField; @@ -320,8 +320,8 @@ mod tests { use std::marker::PhantomData; use anyhow::Result; - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; + use plonky2::field::types::Field; use plonky2::gates::gate::Gate; use plonky2::gates::gate_testing::{test_eval_fns, test_low_degree}; use plonky2::hash::hash_types::HashOut; diff --git a/plonky2/benches/ffts.rs b/plonky2/benches/ffts.rs index c9320537..4149c02d 100644 --- a/plonky2/benches/ffts.rs +++ b/plonky2/benches/ffts.rs @@ -1,9 +1,9 @@ mod allocator; use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; -use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; use plonky2::field::polynomial::PolynomialCoeffs; +use plonky2::field::types::Field; use tynm::type_name; pub(crate) fn bench_ffts(c: &mut Criterion) { diff --git a/plonky2/benches/field_arithmetic.rs b/plonky2/benches/field_arithmetic.rs index 392d7b52..a3b66fa1 100644 --- a/plonky2/benches/field_arithmetic.rs +++ b/plonky2/benches/field_arithmetic.rs @@ -4,8 +4,8 @@ use criterion::{criterion_group, criterion_main, BatchSize, Criterion}; use plonky2::field::extension::quadratic::QuadraticExtension; use plonky2::field::extension::quartic::QuarticExtension; use plonky2::field::extension::quintic::QuinticExtension; -use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; +use plonky2::field::types::Field; use tynm::type_name; pub(crate) fn bench_field(c: &mut Criterion) { diff --git a/plonky2/benches/reverse_index_bits.rs b/plonky2/benches/reverse_index_bits.rs index fb0b0d52..8916fb5d 100644 --- a/plonky2/benches/reverse_index_bits.rs +++ b/plonky2/benches/reverse_index_bits.rs @@ -1,8 +1,8 @@ mod allocator; use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; -use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; +use plonky2::field::types::Field; use plonky2_util::{reverse_index_bits, reverse_index_bits_in_place}; type F = GoldilocksField; diff --git a/plonky2/benches/transpose.rs b/plonky2/benches/transpose.rs index dee020cb..64d103ad 100644 --- a/plonky2/benches/transpose.rs +++ b/plonky2/benches/transpose.rs @@ -1,8 +1,8 @@ mod allocator; use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; -use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; +use plonky2::field::types::Field; use plonky2::util::transpose; fn criterion_benchmark(c: &mut Criterion) { diff --git a/plonky2/src/bin/generate_constants.rs b/plonky2/src/bin/generate_constants.rs index 6527b361..258c6b78 100644 --- a/plonky2/src/bin/generate_constants.rs +++ b/plonky2/src/bin/generate_constants.rs @@ -2,8 +2,8 @@ #![allow(clippy::needless_range_loop)] -use plonky2_field::field_types::Field64; use plonky2_field::goldilocks_field::GoldilocksField; +use plonky2_field::types::Field64; use rand::{Rng, SeedableRng}; use rand_chacha::ChaCha8Rng; diff --git a/plonky2/src/fri/oracle.rs b/plonky2/src/fri/oracle.rs index 73fc2dfe..558c60b8 100644 --- a/plonky2/src/fri/oracle.rs +++ b/plonky2/src/fri/oracle.rs @@ -1,9 +1,9 @@ use itertools::Itertools; use plonky2_field::extension::Extendable; use plonky2_field::fft::FftRootTable; -use plonky2_field::field_types::Field; use plonky2_field::packed_field::PackedField; use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues}; +use plonky2_field::types::Field; use plonky2_util::{log2_strict, reverse_index_bits_in_place}; use rayon::prelude::*; diff --git a/plonky2/src/fri/verifier.rs b/plonky2/src/fri/verifier.rs index bf18e803..551c2c0f 100644 --- a/plonky2/src/fri/verifier.rs +++ b/plonky2/src/fri/verifier.rs @@ -1,7 +1,7 @@ use anyhow::{ensure, Result}; use plonky2_field::extension::{flatten, Extendable, FieldExtension}; -use plonky2_field::field_types::Field; use plonky2_field::interpolation::{barycentric_weights, interpolate}; +use plonky2_field::types::Field; use plonky2_util::{log2_strict, reverse_index_bits_in_place}; use crate::fri::proof::{FriChallenges, FriInitialTreeProof, FriProof, FriQueryRound}; diff --git a/plonky2/src/gadgets/arithmetic.rs b/plonky2/src/gadgets/arithmetic.rs index bbf3b889..f4722df4 100644 --- a/plonky2/src/gadgets/arithmetic.rs +++ b/plonky2/src/gadgets/arithmetic.rs @@ -1,7 +1,7 @@ use std::borrow::Borrow; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field64; +use plonky2_field::types::Field64; use crate::gates::arithmetic_base::ArithmeticGate; use crate::gates::exponentiation::ExponentiationGate; diff --git a/plonky2/src/gadgets/arithmetic_extension.rs b/plonky2/src/gadgets/arithmetic_extension.rs index acca2096..97dedf28 100644 --- a/plonky2/src/gadgets/arithmetic_extension.rs +++ b/plonky2/src/gadgets/arithmetic_extension.rs @@ -2,7 +2,7 @@ use std::borrow::Borrow; use plonky2_field::extension::FieldExtension; use plonky2_field::extension::{Extendable, OEF}; -use plonky2_field::field_types::{Field, Field64}; +use plonky2_field::types::{Field, Field64}; use plonky2_util::bits_u64; use crate::gates::arithmetic_extension::ArithmeticExtensionGate; @@ -570,7 +570,7 @@ pub(crate) struct ExtensionArithmeticOperation, const mod tests { use anyhow::Result; use plonky2_field::extension::algebra::ExtensionAlgebra; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use crate::iop::ext_target::ExtensionAlgebraTarget; use crate::iop::witness::{PartialWitness, Witness}; diff --git a/plonky2/src/gadgets/interpolation.rs b/plonky2/src/gadgets/interpolation.rs index d7a6c311..b22f3b59 100644 --- a/plonky2/src/gadgets/interpolation.rs +++ b/plonky2/src/gadgets/interpolation.rs @@ -106,8 +106,8 @@ impl, const D: usize> CircuitBuilder { mod tests { use anyhow::Result; use plonky2_field::extension::FieldExtension; - use plonky2_field::field_types::Field; use plonky2_field::interpolation::interpolant; + use plonky2_field::types::Field; use crate::gates::interpolation::HighDegreeInterpolationGate; use crate::gates::low_degree_interpolation::LowDegreeInterpolationGate; diff --git a/plonky2/src/gadgets/random_access.rs b/plonky2/src/gadgets/random_access.rs index 686636cf..0d32c360 100644 --- a/plonky2/src/gadgets/random_access.rs +++ b/plonky2/src/gadgets/random_access.rs @@ -55,7 +55,7 @@ impl, const D: usize> CircuitBuilder { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use super::*; use crate::iop::witness::PartialWitness; diff --git a/plonky2/src/gadgets/select.rs b/plonky2/src/gadgets/select.rs index c4634c56..db9be843 100644 --- a/plonky2/src/gadgets/select.rs +++ b/plonky2/src/gadgets/select.rs @@ -41,7 +41,7 @@ impl, const D: usize> CircuitBuilder { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use crate::iop::witness::{PartialWitness, Witness}; use crate::plonk::circuit_builder::CircuitBuilder; diff --git a/plonky2/src/gadgets/split_base.rs b/plonky2/src/gadgets/split_base.rs index 5e29f322..c539d784 100644 --- a/plonky2/src/gadgets/split_base.rs +++ b/plonky2/src/gadgets/split_base.rs @@ -2,7 +2,7 @@ use std::borrow::Borrow; use itertools::Itertools; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::gates::base_sum::BaseSumGate; use crate::hash::hash_types::RichField; @@ -99,7 +99,7 @@ impl SimpleGenerator for BaseSumGenerator { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use rand::{thread_rng, Rng}; use crate::iop::witness::PartialWitness; diff --git a/plonky2/src/gates/assert_le.rs b/plonky2/src/gates/assert_le.rs index 4aa6284f..5ccf178a 100644 --- a/plonky2/src/gates/assert_le.rs +++ b/plonky2/src/gates/assert_le.rs @@ -1,8 +1,8 @@ use std::marker::PhantomData; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::{Field, Field64}; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::{Field, Field64}; use plonky2_util::{bits_u64, ceil_div_usize}; use crate::gates::gate::Gate; @@ -451,9 +451,9 @@ mod tests { use anyhow::Result; use plonky2_field::extension::quartic::QuarticExtension; - use plonky2_field::field_types::Field; - use plonky2_field::field_types::PrimeField64; use plonky2_field::goldilocks_field::GoldilocksField; + use plonky2_field::types::Field; + use plonky2_field::types::PrimeField64; use rand::Rng; use crate::gates::assert_le::AssertLessThanGate; diff --git a/plonky2/src/gates/base_sum.rs b/plonky2/src/gates/base_sum.rs index 83453058..ddd88276 100644 --- a/plonky2/src/gates/base_sum.rs +++ b/plonky2/src/gates/base_sum.rs @@ -1,8 +1,8 @@ use std::ops::Range; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::{Field, Field64}; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::{Field, Field64}; use crate::gates::gate::Gate; use crate::gates::packed_util::PackedEvaluableBase; diff --git a/plonky2/src/gates/exponentiation.rs b/plonky2/src/gates/exponentiation.rs index 4edbaccd..8c160956 100644 --- a/plonky2/src/gates/exponentiation.rs +++ b/plonky2/src/gates/exponentiation.rs @@ -1,9 +1,9 @@ use std::marker::PhantomData; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; use plonky2_field::ops::Square; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::Field; use crate::gates::gate::Gate; use crate::gates::packed_util::PackedEvaluableBase; @@ -285,8 +285,8 @@ mod tests { use std::marker::PhantomData; use anyhow::Result; - use plonky2_field::field_types::Field; use plonky2_field::goldilocks_field::GoldilocksField; + use plonky2_field::types::Field; use plonky2_util::log2_ceil; use rand::Rng; diff --git a/plonky2/src/gates/gate.rs b/plonky2/src/gates/gate.rs index 81dde0bd..2e6b36ef 100644 --- a/plonky2/src/gates/gate.rs +++ b/plonky2/src/gates/gate.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use plonky2_field::batch_util::batch_multiply_inplace; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::gates::selectors::UNUSED_SELECTOR; use crate::gates::util::StridedConstraintConsumer; diff --git a/plonky2/src/gates/gate_testing.rs b/plonky2/src/gates/gate_testing.rs index afe0c657..e9c4c237 100644 --- a/plonky2/src/gates/gate_testing.rs +++ b/plonky2/src/gates/gate_testing.rs @@ -1,7 +1,7 @@ use anyhow::{ensure, Result}; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues}; +use plonky2_field::types::Field; use plonky2_util::log2_ceil; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/interpolation.rs b/plonky2/src/gates/interpolation.rs index ca7cdea3..c98f7fe3 100644 --- a/plonky2/src/gates/interpolation.rs +++ b/plonky2/src/gates/interpolation.rs @@ -271,9 +271,9 @@ mod tests { use std::marker::PhantomData; use anyhow::Result; - use plonky2_field::field_types::Field; use plonky2_field::goldilocks_field::GoldilocksField; use plonky2_field::polynomial::PolynomialCoeffs; + use plonky2_field::types::Field; use crate::gadgets::interpolation::InterpolationGate; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/low_degree_interpolation.rs b/plonky2/src/gates/low_degree_interpolation.rs index eece05b3..4852792a 100644 --- a/plonky2/src/gates/low_degree_interpolation.rs +++ b/plonky2/src/gates/low_degree_interpolation.rs @@ -3,9 +3,9 @@ use std::ops::Range; use plonky2_field::extension::algebra::PolynomialCoeffsAlgebra; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; use plonky2_field::interpolation::interpolant; use plonky2_field::polynomial::PolynomialCoeffs; +use plonky2_field::types::Field; use crate::gadgets::interpolation::InterpolationGate; use crate::gadgets::polynomial::PolynomialCoeffsExtAlgebraTarget; @@ -383,9 +383,9 @@ impl, const D: usize> SimpleGenerator mod tests { use anyhow::Result; use plonky2_field::extension::quadratic::QuadraticExtension; - use plonky2_field::field_types::Field; use plonky2_field::goldilocks_field::GoldilocksField; use plonky2_field::polynomial::PolynomialCoeffs; + use plonky2_field::types::Field; use crate::gadgets::interpolation::InterpolationGate; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/poseidon.rs b/plonky2/src/gates/poseidon.rs index 6e6d20b5..3ae8db83 100644 --- a/plonky2/src/gates/poseidon.rs +++ b/plonky2/src/gates/poseidon.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::gates::gate::Gate; use crate::gates::poseidon_mds::PoseidonMdsGate; @@ -506,8 +506,8 @@ impl + Poseidon, const D: usize> SimpleGenerator #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; use plonky2_field::goldilocks_field::GoldilocksField; + use plonky2_field::types::Field; use crate::gates::gate_testing::{test_eval_fns, test_low_degree}; use crate::gates::poseidon::PoseidonGate; diff --git a/plonky2/src/gates/poseidon_mds.rs b/plonky2/src/gates/poseidon_mds.rs index 00d55fea..2ccfa640 100644 --- a/plonky2/src/gates/poseidon_mds.rs +++ b/plonky2/src/gates/poseidon_mds.rs @@ -4,7 +4,7 @@ use std::ops::Range; use plonky2_field::extension::algebra::ExtensionAlgebra; use plonky2_field::extension::Extendable; use plonky2_field::extension::FieldExtension; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::gates::gate::Gate; use crate::gates::util::StridedConstraintConsumer; diff --git a/plonky2/src/gates/random_access.rs b/plonky2/src/gates/random_access.rs index a20aa1a4..64c7ca5d 100644 --- a/plonky2/src/gates/random_access.rs +++ b/plonky2/src/gates/random_access.rs @@ -2,8 +2,8 @@ use std::marker::PhantomData; use itertools::Itertools; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::Field; use crate::gates::gate::Gate; use crate::gates::packed_util::PackedEvaluableBase; @@ -361,8 +361,8 @@ mod tests { use std::marker::PhantomData; use anyhow::Result; - use plonky2_field::field_types::Field; use plonky2_field::goldilocks_field::GoldilocksField; + use plonky2_field::types::Field; use rand::{thread_rng, Rng}; use crate::gates::gate::Gate; diff --git a/plonky2/src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs b/plonky2/src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs index 804524ee..b40b4277 100644 --- a/plonky2/src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs +++ b/plonky2/src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs @@ -2,7 +2,7 @@ use std::arch::asm; use std::arch::x86_64::*; use std::mem::size_of; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use plonky2_field::goldilocks_field::GoldilocksField; use plonky2_util::branch_hint; use static_assertions::const_assert; diff --git a/plonky2/src/hash/hash_types.rs b/plonky2/src/hash/hash_types.rs index 01062960..281930a5 100644 --- a/plonky2/src/hash/hash_types.rs +++ b/plonky2/src/hash/hash_types.rs @@ -1,5 +1,5 @@ -use plonky2_field::field_types::{Field, PrimeField64}; use plonky2_field::goldilocks_field::GoldilocksField; +use plonky2_field::types::{Field, PrimeField64}; use rand::Rng; use serde::{Deserialize, Deserializer, Serialize, Serializer}; diff --git a/plonky2/src/hash/merkle_proofs.rs b/plonky2/src/hash/merkle_proofs.rs index a46040f9..6ba1b817 100644 --- a/plonky2/src/hash/merkle_proofs.rs +++ b/plonky2/src/hash/merkle_proofs.rs @@ -126,7 +126,7 @@ impl, const D: usize> CircuitBuilder { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use rand::{thread_rng, Rng}; use super::*; diff --git a/plonky2/src/hash/path_compression.rs b/plonky2/src/hash/path_compression.rs index 6dae3d94..2685f723 100644 --- a/plonky2/src/hash/path_compression.rs +++ b/plonky2/src/hash/path_compression.rs @@ -115,7 +115,7 @@ where #[cfg(test)] mod tests { - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use rand::{thread_rng, Rng}; use super::*; diff --git a/plonky2/src/hash/poseidon.rs b/plonky2/src/hash/poseidon.rs index 4f41622c..54c2379f 100644 --- a/plonky2/src/hash/poseidon.rs +++ b/plonky2/src/hash/poseidon.rs @@ -2,7 +2,7 @@ //! https://eprint.iacr.org/2019/458.pdf use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::{Field, PrimeField64}; +use plonky2_field::types::{Field, PrimeField64}; use unroll::unroll_for_loops; use crate::gates::gate::Gate; @@ -684,7 +684,7 @@ impl AlgebraicHasher for PoseidonHash { #[cfg(test)] pub(crate) mod test_helpers { - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use crate::hash::hashing::SPONGE_WIDTH; use crate::hash::poseidon::Poseidon; diff --git a/plonky2/src/hash/poseidon_goldilocks.rs b/plonky2/src/hash/poseidon_goldilocks.rs index 177b30ff..658b397e 100644 --- a/plonky2/src/hash/poseidon_goldilocks.rs +++ b/plonky2/src/hash/poseidon_goldilocks.rs @@ -271,9 +271,9 @@ impl Poseidon for GoldilocksField { #[cfg(test)] mod tests { - use plonky2_field::field_types::Field; - use plonky2_field::field_types::PrimeField64; use plonky2_field::goldilocks_field::GoldilocksField as F; + use plonky2_field::types::Field; + use plonky2_field::types::PrimeField64; use crate::hash::poseidon::test_helpers::{check_consistency, check_test_vectors}; diff --git a/plonky2/src/iop/challenger.rs b/plonky2/src/iop/challenger.rs index 8670f216..52412409 100644 --- a/plonky2/src/iop/challenger.rs +++ b/plonky2/src/iop/challenger.rs @@ -274,7 +274,7 @@ impl, H: AlgebraicHasher, const D: usize> #[cfg(test)] mod tests { - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use crate::iop::challenger::{Challenger, RecursiveChallenger}; use crate::iop::generator::generate_partial_witness; diff --git a/plonky2/src/iop/ext_target.rs b/plonky2/src/iop/ext_target.rs index 31ef2159..8a63cf44 100644 --- a/plonky2/src/iop/ext_target.rs +++ b/plonky2/src/iop/ext_target.rs @@ -2,7 +2,7 @@ use std::ops::Range; use plonky2_field::extension::algebra::ExtensionAlgebra; use plonky2_field::extension::{Extendable, FieldExtension, OEF}; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::hash::hash_types::RichField; use crate::iop::target::Target; diff --git a/plonky2/src/iop/generator.rs b/plonky2/src/iop/generator.rs index 30fac52b..5bedf13d 100644 --- a/plonky2/src/iop/generator.rs +++ b/plonky2/src/iop/generator.rs @@ -2,7 +2,7 @@ use std::fmt::Debug; use std::marker::PhantomData; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::hash::hash_types::{HashOut, HashOutTarget, RichField}; use crate::iop::ext_target::ExtensionTarget; diff --git a/plonky2/src/iop/witness.rs b/plonky2/src/iop/witness.rs index 03c9d0f8..871f303f 100644 --- a/plonky2/src/iop/witness.rs +++ b/plonky2/src/iop/witness.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use itertools::Itertools; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::fri::structure::{FriOpenings, FriOpeningsTarget}; use crate::fri::witness_util::set_fri_proof_target; diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs index 4249e1ef..9f97251a 100644 --- a/plonky2/src/plonk/circuit_builder.rs +++ b/plonky2/src/plonk/circuit_builder.rs @@ -6,8 +6,8 @@ use log::{debug, info, Level}; use plonky2_field::cosets::get_unique_coset_shifts; use plonky2_field::extension::{Extendable, FieldExtension}; use plonky2_field::fft::fft_root_table; -use plonky2_field::field_types::Field; use plonky2_field::polynomial::PolynomialValues; +use plonky2_field::types::Field; use plonky2_util::{log2_ceil, log2_strict}; use crate::fri::oracle::PolynomialBatch; diff --git a/plonky2/src/plonk/circuit_data.rs b/plonky2/src/plonk/circuit_data.rs index 67bf89cf..fb839978 100644 --- a/plonky2/src/plonk/circuit_data.rs +++ b/plonky2/src/plonk/circuit_data.rs @@ -5,7 +5,7 @@ use anyhow::Result; use plonky2_field::extension::Extendable; use plonky2_field::fft::FftRootTable; -use crate::field::field_types::Field; +use crate::field::types::Field; use crate::fri::oracle::PolynomialBatch; use crate::fri::reduction_strategies::FriReductionStrategy; use crate::fri::structure::{ diff --git a/plonky2/src/plonk/permutation_argument.rs b/plonky2/src/plonk/permutation_argument.rs index 3bf2e91f..076c2a7a 100644 --- a/plonky2/src/plonk/permutation_argument.rs +++ b/plonky2/src/plonk/permutation_argument.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use plonky2_field::field_types::Field; use plonky2_field::polynomial::PolynomialValues; +use plonky2_field::types::Field; use rayon::prelude::*; use crate::iop::target::Target; diff --git a/plonky2/src/plonk/plonk_common.rs b/plonky2/src/plonk/plonk_common.rs index ef73707a..0ee072af 100644 --- a/plonky2/src/plonk/plonk_common.rs +++ b/plonky2/src/plonk/plonk_common.rs @@ -1,6 +1,6 @@ use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::Field; use crate::fri::oracle::SALT_SIZE; use crate::fri::structure::FriOracleInfo; diff --git a/plonky2/src/plonk/proof.rs b/plonky2/src/plonk/proof.rs index 357c6836..18af1f73 100644 --- a/plonky2/src/plonk/proof.rs +++ b/plonky2/src/plonk/proof.rs @@ -378,7 +378,7 @@ impl OpeningSetTarget { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2_field::field_types::Field; + use plonky2_field::types::Field; use crate::fri::reduction_strategies::FriReductionStrategy; use crate::gates::noop::NoopGate; diff --git a/plonky2/src/plonk/prover.rs b/plonky2/src/plonk/prover.rs index 18e21085..26626208 100644 --- a/plonky2/src/plonk/prover.rs +++ b/plonky2/src/plonk/prover.rs @@ -8,7 +8,7 @@ use plonky2_field::zero_poly_coset::ZeroPolyOnCoset; use plonky2_util::{ceil_div_usize, log2_ceil}; use rayon::prelude::*; -use crate::field::field_types::Field; +use crate::field::types::Field; use crate::fri::oracle::PolynomialBatch; use crate::hash::hash_types::RichField; use crate::iop::challenger::Challenger; diff --git a/plonky2/src/plonk/vanishing_poly.rs b/plonky2/src/plonk/vanishing_poly.rs index 06f5078d..ab0ba53b 100644 --- a/plonky2/src/plonk/vanishing_poly.rs +++ b/plonky2/src/plonk/vanishing_poly.rs @@ -1,6 +1,6 @@ use plonky2_field::batch_util::batch_add_inplace; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use plonky2_field::zero_poly_coset::ZeroPolyOnCoset; use crate::hash::hash_types::RichField; diff --git a/plonky2/src/plonk/vars.rs b/plonky2/src/plonk/vars.rs index 4fe99cd0..c85ae7b2 100644 --- a/plonky2/src/plonk/vars.rs +++ b/plonky2/src/plonk/vars.rs @@ -2,8 +2,8 @@ use std::ops::Range; use plonky2_field::extension::algebra::ExtensionAlgebra; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; use plonky2_field::packed_field::PackedField; +use plonky2_field::types::Field; use crate::hash::hash_types::{HashOut, HashOutTarget, RichField}; use crate::iop::ext_target::{ExtensionAlgebraTarget, ExtensionTarget}; diff --git a/plonky2/src/plonk/verifier.rs b/plonky2/src/plonk/verifier.rs index 6c83c211..13821ff3 100644 --- a/plonky2/src/plonk/verifier.rs +++ b/plonky2/src/plonk/verifier.rs @@ -1,6 +1,6 @@ use anyhow::{ensure, Result}; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use crate::fri::verifier::verify_fri_proof; use crate::hash::hash_types::RichField; diff --git a/plonky2/src/util/mod.rs b/plonky2/src/util/mod.rs index 329b2143..9f15b8a1 100644 --- a/plonky2/src/util/mod.rs +++ b/plonky2/src/util/mod.rs @@ -1,5 +1,5 @@ -use plonky2_field::field_types::Field; use plonky2_field::polynomial::PolynomialValues; +use plonky2_field::types::Field; pub(crate) mod context_tree; pub(crate) mod partial_products; diff --git a/plonky2/src/util/partial_products.rs b/plonky2/src/util/partial_products.rs index cc09bbef..39e59a28 100644 --- a/plonky2/src/util/partial_products.rs +++ b/plonky2/src/util/partial_products.rs @@ -2,7 +2,7 @@ use std::iter; use itertools::Itertools; use plonky2_field::extension::Extendable; -use plonky2_field::field_types::Field; +use plonky2_field::types::Field; use plonky2_util::ceil_div_usize; use crate::hash::hash_types::RichField; diff --git a/plonky2/src/util/reducing.rs b/plonky2/src/util/reducing.rs index 1590d8a3..1274ab6e 100644 --- a/plonky2/src/util/reducing.rs +++ b/plonky2/src/util/reducing.rs @@ -1,9 +1,9 @@ use std::borrow::Borrow; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::Field; use plonky2_field::packed_field::PackedField; use plonky2_field::polynomial::PolynomialCoeffs; +use plonky2_field::types::Field; use crate::gates::arithmetic_extension::ArithmeticExtensionGate; use crate::gates::reducing::ReducingGate; diff --git a/plonky2/src/util/serialization.rs b/plonky2/src/util/serialization.rs index 74f10ff1..da03213c 100644 --- a/plonky2/src/util/serialization.rs +++ b/plonky2/src/util/serialization.rs @@ -3,8 +3,8 @@ use std::io::Cursor; use std::io::{Read, Result, Write}; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::field_types::{Field64, PrimeField64}; use plonky2_field::polynomial::PolynomialCoeffs; +use plonky2_field::types::{Field64, PrimeField64}; use crate::fri::proof::{ CompressedFriProof, CompressedFriQueryRounds, FriInitialTreeProof, FriProof, FriQueryRound, diff --git a/starky/src/fibonacci_stark.rs b/starky/src/fibonacci_stark.rs index 4e0171b6..a98fe7db 100644 --- a/starky/src/fibonacci_stark.rs +++ b/starky/src/fibonacci_stark.rs @@ -123,7 +123,7 @@ impl, const D: usize> Stark for FibonacciStar mod tests { use anyhow::Result; use plonky2::field::extension::Extendable; - use plonky2::field::field_types::Field; + use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/starky/src/permutation.rs b/starky/src/permutation.rs index c401664b..089f9c61 100644 --- a/starky/src/permutation.rs +++ b/starky/src/permutation.rs @@ -3,9 +3,9 @@ use itertools::Itertools; use plonky2::field::batch_util::batch_multiply_inplace; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; use plonky2::field::polynomial::PolynomialValues; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::challenger::{Challenger, RecursiveChallenger}; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/starky/src/prover.rs b/starky/src/prover.rs index e148b195..2f8286b6 100644 --- a/starky/src/prover.rs +++ b/starky/src/prover.rs @@ -3,10 +3,10 @@ use std::iter::once; use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; use plonky2::field::packable::Packable; use plonky2::field::packed_field::PackedField; use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues}; +use plonky2::field::types::Field; use plonky2::field::zero_poly_coset::ZeroPolyOnCoset; use plonky2::fri::oracle::PolynomialBatch; use plonky2::hash::hash_types::RichField; diff --git a/starky/src/recursive_verifier.rs b/starky/src/recursive_verifier.rs index 7078fdea..7f20d89b 100644 --- a/starky/src/recursive_verifier.rs +++ b/starky/src/recursive_verifier.rs @@ -3,7 +3,7 @@ use std::iter::once; use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; +use plonky2::field::types::Field; use plonky2::fri::witness_util::set_fri_proof_target; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/starky/src/stark_testing.rs b/starky/src/stark_testing.rs index 704912b7..b13b90df 100644 --- a/starky/src/stark_testing.rs +++ b/starky/src/stark_testing.rs @@ -1,7 +1,7 @@ use anyhow::{ensure, Result}; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues}; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::witness::{PartialWitness, Witness}; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/starky/src/util.rs b/starky/src/util.rs index 011a1add..297978ee 100644 --- a/starky/src/util.rs +++ b/starky/src/util.rs @@ -1,6 +1,6 @@ use itertools::Itertools; -use plonky2::field::field_types::Field; use plonky2::field::polynomial::PolynomialValues; +use plonky2::field::types::Field; use plonky2::util::transpose; /// A helper function to transpose a row-wise trace and put it in the format that `prove` expects. diff --git a/starky/src/vars.rs b/starky/src/vars.rs index cb83aeb7..0ed013e7 100644 --- a/starky/src/vars.rs +++ b/starky/src/vars.rs @@ -1,5 +1,5 @@ -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::Field; use plonky2::iop::ext_target::ExtensionTarget; #[derive(Debug, Copy, Clone)] diff --git a/starky/src/verifier.rs b/starky/src/verifier.rs index 2dc2fb46..306d3d14 100644 --- a/starky/src/verifier.rs +++ b/starky/src/verifier.rs @@ -3,7 +3,7 @@ use std::iter::once; use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::field_types::Field; +use plonky2::field::types::Field; use plonky2::fri::verifier::verify_fri_proof; use plonky2::hash::hash_types::RichField; use plonky2::plonk::config::{GenericConfig, Hasher}; @@ -185,9 +185,9 @@ fn check_permutation_options< #[cfg(test)] mod tests { - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; use plonky2::field::polynomial::PolynomialValues; + use plonky2::field::types::Field; use crate::verifier::eval_l_1_and_l_last; diff --git a/system_zero/benches/lookup_permuted_cols.rs b/system_zero/benches/lookup_permuted_cols.rs index e44e9fc8..0088f565 100644 --- a/system_zero/benches/lookup_permuted_cols.rs +++ b/system_zero/benches/lookup_permuted_cols.rs @@ -2,8 +2,8 @@ mod allocator; use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; use itertools::Itertools; -use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; +use plonky2::field::types::Field; use rand::{thread_rng, Rng}; use system_zero::lookup::permuted_cols; diff --git a/system_zero/src/alu/addition.rs b/system_zero/src/alu/addition.rs index f9454779..93b3316b 100644 --- a/system_zero/src/alu/addition.rs +++ b/system_zero/src/alu/addition.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/alu/bitops.rs b/system_zero/src/alu/bitops.rs index 4bbb5db9..aa2d23b9 100644 --- a/system_zero/src/alu/bitops.rs +++ b/system_zero/src/alu/bitops.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; @@ -236,8 +236,8 @@ pub(crate) fn eval_bitop_circuit, const D: usize>( #[cfg(test)] mod tests { - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; + use plonky2::field::types::Field; use rand::{Rng, SeedableRng}; use rand_chacha::ChaCha8Rng; use starky::constraint_consumer::ConstraintConsumer; diff --git a/system_zero/src/alu/canonical.rs b/system_zero/src/alu/canonical.rs index f14d0aaf..dae04e30 100644 --- a/system_zero/src/alu/canonical.rs +++ b/system_zero/src/alu/canonical.rs @@ -3,8 +3,8 @@ //! See https://hackmd.io/NC-yRmmtRQSvToTHb96e8Q#Checking-element-validity use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/alu/division.rs b/system_zero/src/alu/division.rs index 4b3294a1..d95fda6d 100644 --- a/system_zero/src/alu/division.rs +++ b/system_zero/src/alu/division.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; @@ -159,8 +159,8 @@ pub(crate) fn eval_division_circuit, const D: usize #[cfg(test)] mod tests { - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; + use plonky2::field::types::Field; use rand::{Rng, SeedableRng}; use rand_chacha::ChaCha8Rng; use starky::constraint_consumer::ConstraintConsumer; diff --git a/system_zero/src/alu/mod.rs b/system_zero/src/alu/mod.rs index f7bfb09e..dea709f7 100644 --- a/system_zero/src/alu/mod.rs +++ b/system_zero/src/alu/mod.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; use starky::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer}; diff --git a/system_zero/src/alu/mul_add.rs b/system_zero/src/alu/mul_add.rs index 9b77e0b2..3166017d 100644 --- a/system_zero/src/alu/mul_add.rs +++ b/system_zero/src/alu/mul_add.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/alu/rotate_shift.rs b/system_zero/src/alu/rotate_shift.rs index b4d3f591..ea35dfb3 100644 --- a/system_zero/src/alu/rotate_shift.rs +++ b/system_zero/src/alu/rotate_shift.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/alu/subtraction.rs b/system_zero/src/alu/subtraction.rs index d1b9c049..99678cc1 100644 --- a/system_zero/src/alu/subtraction.rs +++ b/system_zero/src/alu/subtraction.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/core_registers.rs b/system_zero/src/core_registers.rs index 44a9fc3c..56eb8fd7 100644 --- a/system_zero/src/core_registers.rs +++ b/system_zero/src/core_registers.rs @@ -1,6 +1,6 @@ use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; use starky::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer}; diff --git a/system_zero/src/lookup.rs b/system_zero/src/lookup.rs index e5850d1b..b8e6158e 100644 --- a/system_zero/src/lookup.rs +++ b/system_zero/src/lookup.rs @@ -8,8 +8,8 @@ use std::cmp::Ordering; use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::field_types::{Field, PrimeField64}; use plonky2::field::packed_field::PackedField; +use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; use starky::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer}; diff --git a/system_zero/src/permutation_unit.rs b/system_zero/src/permutation_unit.rs index 52f85322..e5235026 100644 --- a/system_zero/src/permutation_unit.rs +++ b/system_zero/src/permutation_unit.rs @@ -254,8 +254,8 @@ pub(crate) fn eval_permutation_unit_circuit, const #[cfg(test)] mod tests { - use plonky2::field::field_types::Field; use plonky2::field::goldilocks_field::GoldilocksField; + use plonky2::field::types::Field; use plonky2::hash::poseidon::Poseidon; use rand::SeedableRng; use rand_chacha::ChaCha8Rng; diff --git a/system_zero/src/system_zero.rs b/system_zero/src/system_zero.rs index 4b3bce95..bfd07563 100644 --- a/system_zero/src/system_zero.rs +++ b/system_zero/src/system_zero.rs @@ -176,8 +176,8 @@ impl, const D: usize> Stark for SystemZero SimpleGenerator for PermutationGenerator { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2::field::field_types::Field; + use plonky2::field::types::Field; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig}; diff --git a/waksman/src/sorting.rs b/waksman/src/sorting.rs index 53e3dcbf..ac598dc8 100644 --- a/waksman/src/sorting.rs +++ b/waksman/src/sorting.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use itertools::izip; use plonky2::field::extension::Extendable; -use plonky2::field::field_types::Field; +use plonky2::field::types::Field; use plonky2::gates::assert_le::AssertLessThanGate; use plonky2::hash::hash_types::RichField; use plonky2::iop::generator::{GeneratedValues, SimpleGenerator}; @@ -183,7 +183,7 @@ impl, const D: usize> SimpleGenerator #[cfg(test)] mod tests { use anyhow::Result; - use plonky2::field::field_types::{Field, PrimeField64}; + use plonky2::field::types::{Field, PrimeField64}; use plonky2::iop::witness::PartialWitness; use plonky2::plonk::circuit_data::CircuitConfig; use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};