From e73d01a037d530c1533e5ea76513448c1127848b Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 27 Jun 2022 15:07:52 -0700 Subject: [PATCH] `packed_field` -> `packed` (#584) * `packed_field` -> `packed` For cleaner imports; "field" is usually clear from context * fix --- evm/src/constraint_consumer.rs | 2 +- evm/src/cpu/cpu_stark.rs | 2 +- evm/src/cpu/decode.rs | 2 +- evm/src/cpu/simple_logic/eq_iszero.rs | 2 +- evm/src/cpu/simple_logic/mod.rs | 2 +- evm/src/cpu/simple_logic/not.rs | 2 +- evm/src/cross_table_lookup.rs | 2 +- evm/src/keccak/keccak_stark.rs | 2 +- evm/src/keccak/logic.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/stark.rs | 2 +- evm/src/util.rs | 2 +- evm/src/vanishing_poly.rs | 2 +- evm/src/vars.rs | 2 +- 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/fft.rs | 2 +- field/src/lib.rs | 2 +- field/src/packable.rs | 2 +- field/src/{packed_field.rs => packed.rs} | 0 field/src/zero_poly_coset.rs | 2 +- plonky2/src/fri/oracle.rs | 2 +- plonky2/src/gates/arithmetic_base.rs | 2 +- plonky2/src/gates/assert_le.rs | 2 +- plonky2/src/gates/base_sum.rs | 2 +- plonky2/src/gates/constant.rs | 2 +- plonky2/src/gates/exponentiation.rs | 2 +- plonky2/src/gates/packed_util.rs | 2 +- plonky2/src/gates/public_input.rs | 2 +- plonky2/src/gates/random_access.rs | 2 +- plonky2/src/gates/util.rs | 2 +- plonky2/src/plonk/plonk_common.rs | 2 +- plonky2/src/plonk/vars.rs | 2 +- plonky2/src/util/reducing.rs | 2 +- plonky2/src/util/strided_view.rs | 2 +- starky/src/constraint_consumer.rs | 2 +- starky/src/fibonacci_stark.rs | 2 +- starky/src/permutation.rs | 2 +- starky/src/prover.rs | 2 +- starky/src/stark.rs | 2 +- starky/src/vanishing_poly.rs | 2 +- starky/src/vars.rs | 2 +- system_zero/src/alu/addition.rs | 2 +- system_zero/src/alu/bitops.rs | 2 +- system_zero/src/alu/canonical.rs | 2 +- system_zero/src/alu/division.rs | 2 +- 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/gates/arithmetic_u32.rs | 2 +- u32/src/gates/comparison.rs | 2 +- u32/src/gates/subtraction_u32.rs | 2 +- waksman/src/gates/switch.rs | 2 +- 64 files changed, 65 insertions(+), 65 deletions(-) rename field/src/{packed_field.rs => packed.rs} (100%) diff --git a/evm/src/constraint_consumer.rs b/evm/src/constraint_consumer.rs index 07b5ba24..ebe0637a 100644 --- a/evm/src/constraint_consumer.rs +++ b/evm/src/constraint_consumer.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::iop::target::Target; diff --git a/evm/src/cpu/cpu_stark.rs b/evm/src/cpu/cpu_stark.rs index 3c8b3d48..74e5249f 100644 --- a/evm/src/cpu/cpu_stark.rs +++ b/evm/src/cpu/cpu_stark.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use itertools::Itertools; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/cpu/decode.rs b/evm/src/cpu/decode.rs index 735494f0..69d6c810 100644 --- a/evm/src/cpu/decode.rs +++ b/evm/src/cpu/decode.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::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/eq_iszero.rs b/evm/src/cpu/simple_logic/eq_iszero.rs index 5b10ce59..82af4c1b 100644 --- a/evm/src/cpu/simple_logic/eq_iszero.rs +++ b/evm/src/cpu/simple_logic/eq_iszero.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/evm/src/cpu/simple_logic/mod.rs b/evm/src/cpu/simple_logic/mod.rs index aa95da53..368c13bd 100644 --- a/evm/src/cpu/simple_logic/mod.rs +++ b/evm/src/cpu/simple_logic/mod.rs @@ -2,7 +2,7 @@ mod eq_iszero; mod not; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; 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 b52b2132..019ffb80 100644 --- a/evm/src/cpu/simple_logic/not.rs +++ b/evm/src/cpu/simple_logic/not.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::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 e968062c..60ce25d7 100644 --- a/evm/src/cross_table_lookup.rs +++ b/evm/src/cross_table_lookup.rs @@ -3,7 +3,7 @@ use std::iter::repeat; use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/keccak/keccak_stark.rs b/evm/src/keccak/keccak_stark.rs index 41f2aef2..477ffed5 100644 --- a/evm/src/keccak/keccak_stark.rs +++ b/evm/src/keccak/keccak_stark.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use itertools::Itertools; use log::info; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/keccak/logic.rs b/evm/src/keccak/logic.rs index 4fe18a6c..4e29b93f 100644 --- a/evm/src/keccak/logic.rs +++ b/evm/src/keccak/logic.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::PrimeField64; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/evm/src/keccak/round_flags.rs b/evm/src/keccak/round_flags.rs index 5b5d759f..2636c7f2 100644 --- a/evm/src/keccak/round_flags.rs +++ b/evm/src/keccak/round_flags.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/evm/src/logic.rs b/evm/src/logic.rs index b4018c62..cb8d8604 100644 --- a/evm/src/logic.rs +++ b/evm/src/logic.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use itertools::izip; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/lookup.rs b/evm/src/lookup.rs index f1822c5b..2c93143f 100644 --- a/evm/src/lookup.rs +++ b/evm/src/lookup.rs @@ -2,7 +2,7 @@ use std::cmp::Ordering; use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/evm/src/memory/memory_stark.rs b/evm/src/memory/memory_stark.rs index f1fe0d6d..e98a0379 100644 --- a/evm/src/memory/memory_stark.rs +++ b/evm/src/memory/memory_stark.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use itertools::{izip, multiunzip, Itertools}; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/permutation.rs b/evm/src/permutation.rs index 5df8c0a9..a4039ad2 100644 --- a/evm/src/permutation.rs +++ b/evm/src/permutation.rs @@ -3,7 +3,7 @@ use itertools::Itertools; use plonky2::field::batch_util::batch_multiply_inplace; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/prover.rs b/evm/src/prover.rs index ed2d9609..438a0be7 100644 --- a/evm/src/prover.rs +++ b/evm/src/prover.rs @@ -1,7 +1,7 @@ use anyhow::{ensure, Result}; use plonky2::field::extension::Extendable; use plonky2::field::packable::Packable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues}; use plonky2::field::types::Field; use plonky2::field::zero_poly_coset::ZeroPolyOnCoset; diff --git a/evm/src/stark.rs b/evm/src/stark.rs index c342abe6..8935655b 100644 --- a/evm/src/stark.rs +++ b/evm/src/stark.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::fri::structure::{ FriBatchInfo, FriBatchInfoTarget, FriInstanceInfo, FriInstanceInfoTarget, FriOracleInfo, diff --git a/evm/src/util.rs b/evm/src/util.rs index 2d103d67..5bc85f99 100644 --- a/evm/src/util.rs +++ b/evm/src/util.rs @@ -1,6 +1,6 @@ use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/evm/src/vanishing_poly.rs b/evm/src/vanishing_poly.rs index cd50fdba..c0a6534b 100644 --- a/evm/src/vanishing_poly.rs +++ b/evm/src/vanishing_poly.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::config::GenericConfig; diff --git a/evm/src/vars.rs b/evm/src/vars.rs index 0ed013e7..682ac837 100644 --- a/evm/src/vars.rs +++ b/evm/src/vars.rs @@ -1,4 +1,4 @@ -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/field/src/arch/x86_64/avx2_goldilocks_field.rs b/field/src/arch/x86_64/avx2_goldilocks_field.rs index e00e0efc..adef1fac 100644 --- a/field/src/arch/x86_64/avx2_goldilocks_field.rs +++ b/field/src/arch/x86_64/avx2_goldilocks_field.rs @@ -7,7 +7,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssi use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::types::{Field, Field64}; // Ideally `Avx2GoldilocksField` would wrap `__m256i`. Unfortunately, `__m256i` has an alignment of @@ -512,7 +512,7 @@ mod tests { use crate::arch::x86_64::avx2_goldilocks_field::Avx2GoldilocksField; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; - use crate::packed_field::PackedField; + use crate::packed::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 bd7a9b0a..f67e5000 100644 --- a/field/src/arch/x86_64/avx512_goldilocks_field.rs +++ b/field/src/arch/x86_64/avx512_goldilocks_field.rs @@ -7,7 +7,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssi use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::types::{Field, Field64}; // Ideally `Avx512GoldilocksField` would wrap `__m512i`. Unfortunately, `__m512i` has an alignment @@ -409,7 +409,7 @@ mod tests { use crate::arch::x86_64::avx512_goldilocks_field::Avx512GoldilocksField; use crate::goldilocks_field::GoldilocksField; use crate::ops::Square; - use crate::packed_field::PackedField; + use crate::packed::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 4bc240fc..4338b7e4 100644 --- a/field/src/batch_util.rs +++ b/field/src/batch_util.rs @@ -1,5 +1,5 @@ use crate::packable::Packable; -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::types::Field; fn pack_with_leftovers_split_point(slice: &[P::Scalar]) -> usize { diff --git a/field/src/fft.rs b/field/src/fft.rs index b552001e..7e9deae5 100644 --- a/field/src/fft.rs +++ b/field/src/fft.rs @@ -5,7 +5,7 @@ use plonky2_util::{log2_strict, reverse_index_bits_in_place}; use unroll::unroll_for_loops; use crate::packable::Packable; -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::polynomial::{PolynomialCoeffs, PolynomialValues}; use crate::types::Field; diff --git a/field/src/lib.rs b/field/src/lib.rs index dd55d09d..ec5fc80e 100644 --- a/field/src/lib.rs +++ b/field/src/lib.rs @@ -20,7 +20,7 @@ pub mod interpolation; mod inversion; pub mod ops; pub mod packable; -pub mod packed_field; +pub mod packed; pub mod polynomial; pub mod secp256k1_base; pub mod secp256k1_scalar; diff --git a/field/src/packable.rs b/field/src/packable.rs index b1dc4c78..c6f8cd36 100644 --- a/field/src/packable.rs +++ b/field/src/packable.rs @@ -1,4 +1,4 @@ -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::types::Field; /// Points us to the default packing for a particular field. There may me multiple choices of diff --git a/field/src/packed_field.rs b/field/src/packed.rs similarity index 100% rename from field/src/packed_field.rs rename to field/src/packed.rs diff --git a/field/src/zero_poly_coset.rs b/field/src/zero_poly_coset.rs index 0f5a82a4..18cc3238 100644 --- a/field/src/zero_poly_coset.rs +++ b/field/src/zero_poly_coset.rs @@ -1,4 +1,4 @@ -use crate::packed_field::PackedField; +use crate::packed::PackedField; use crate::types::Field; /// Precomputations of the evaluation of `Z_H(X) = X^n - 1` on a coset `gK` with `H <= K`. diff --git a/plonky2/src/fri/oracle.rs b/plonky2/src/fri/oracle.rs index 558c60b8..312b458b 100644 --- a/plonky2/src/fri/oracle.rs +++ b/plonky2/src/fri/oracle.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use plonky2_field::extension::Extendable; use plonky2_field::fft::FftRootTable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues}; use plonky2_field::types::Field; use plonky2_util::{log2_strict, reverse_index_bits_in_place}; diff --git a/plonky2/src/gates/arithmetic_base.rs b/plonky2/src/gates/arithmetic_base.rs index f91d2722..207af2d0 100644 --- a/plonky2/src/gates/arithmetic_base.rs +++ b/plonky2/src/gates/arithmetic_base.rs @@ -1,5 +1,5 @@ use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use crate::gates::gate::Gate; use crate::gates::packed_util::PackedEvaluableBase; diff --git a/plonky2/src/gates/assert_le.rs b/plonky2/src/gates/assert_le.rs index 5ccf178a..19bff044 100644 --- a/plonky2/src/gates/assert_le.rs +++ b/plonky2/src/gates/assert_le.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::{Field, Field64}; use plonky2_util::{bits_u64, ceil_div_usize}; diff --git a/plonky2/src/gates/base_sum.rs b/plonky2/src/gates/base_sum.rs index ddd88276..a7f4fcb3 100644 --- a/plonky2/src/gates/base_sum.rs +++ b/plonky2/src/gates/base_sum.rs @@ -1,7 +1,7 @@ use std::ops::Range; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::{Field, Field64}; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/constant.rs b/plonky2/src/gates/constant.rs index 449193e7..7d68b088 100644 --- a/plonky2/src/gates/constant.rs +++ b/plonky2/src/gates/constant.rs @@ -1,5 +1,5 @@ use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; 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 8c160956..db12d697 100644 --- a/plonky2/src/gates/exponentiation.rs +++ b/plonky2/src/gates/exponentiation.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use plonky2_field::extension::Extendable; use plonky2_field::ops::Square; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/packed_util.rs b/plonky2/src/gates/packed_util.rs index 2df33666..0889f9ae 100644 --- a/plonky2/src/gates/packed_util.rs +++ b/plonky2/src/gates/packed_util.rs @@ -1,6 +1,6 @@ use plonky2_field::extension::Extendable; use plonky2_field::packable::Packable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use crate::gates::gate::Gate; use crate::gates::util::StridedConstraintConsumer; diff --git a/plonky2/src/gates/public_input.rs b/plonky2/src/gates/public_input.rs index baff421e..60c9a4c3 100644 --- a/plonky2/src/gates/public_input.rs +++ b/plonky2/src/gates/public_input.rs @@ -1,7 +1,7 @@ use std::ops::Range; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use crate::gates::gate::Gate; use crate::gates::packed_util::PackedEvaluableBase; diff --git a/plonky2/src/gates/random_access.rs b/plonky2/src/gates/random_access.rs index 64c7ca5d..b1f1d529 100644 --- a/plonky2/src/gates/random_access.rs +++ b/plonky2/src/gates/random_access.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use itertools::Itertools; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; use crate::gates::gate::Gate; diff --git a/plonky2/src/gates/util.rs b/plonky2/src/gates/util.rs index b4dd5fd6..fb5ab6b1 100644 --- a/plonky2/src/gates/util.rs +++ b/plonky2/src/gates/util.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; /// Writes constraints yielded by a gate to a buffer, with a given stride. /// Permits us to abstract the underlying memory layout. In particular, we can make a matrix of diff --git a/plonky2/src/plonk/plonk_common.rs b/plonky2/src/plonk/plonk_common.rs index 0ee072af..4f92d732 100644 --- a/plonky2/src/plonk/plonk_common.rs +++ b/plonky2/src/plonk/plonk_common.rs @@ -1,5 +1,5 @@ use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; use crate::fri::oracle::SALT_SIZE; diff --git a/plonky2/src/plonk/vars.rs b/plonky2/src/plonk/vars.rs index c85ae7b2..a2474e79 100644 --- a/plonky2/src/plonk/vars.rs +++ b/plonky2/src/plonk/vars.rs @@ -2,7 +2,7 @@ use std::ops::Range; use plonky2_field::extension::algebra::ExtensionAlgebra; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; use crate::hash::hash_types::{HashOut, HashOutTarget, RichField}; diff --git a/plonky2/src/util/reducing.rs b/plonky2/src/util/reducing.rs index 1274ab6e..fae5f03b 100644 --- a/plonky2/src/util/reducing.rs +++ b/plonky2/src/util/reducing.rs @@ -1,7 +1,7 @@ use std::borrow::Borrow; use plonky2_field::extension::{Extendable, FieldExtension}; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::polynomial::PolynomialCoeffs; use plonky2_field::types::Field; diff --git a/plonky2/src/util/strided_view.rs b/plonky2/src/util/strided_view.rs index 6ea270ce..0c1094fd 100644 --- a/plonky2/src/util/strided_view.rs +++ b/plonky2/src/util/strided_view.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use std::mem::size_of; use std::ops::{Index, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive}; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; /// Imagine a slice, but with a stride (a la a NumPy array). /// diff --git a/starky/src/constraint_consumer.rs b/starky/src/constraint_consumer.rs index 574c7e70..c9368ba3 100644 --- a/starky/src/constraint_consumer.rs +++ b/starky/src/constraint_consumer.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; use plonky2::iop::target::Target; diff --git a/starky/src/fibonacci_stark.rs b/starky/src/fibonacci_stark.rs index a98fe7db..b8c8c01e 100644 --- a/starky/src/fibonacci_stark.rs +++ b/starky/src/fibonacci_stark.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/starky/src/permutation.rs b/starky/src/permutation.rs index 089f9c61..88361003 100644 --- a/starky/src/permutation.rs +++ b/starky/src/permutation.rs @@ -3,7 +3,7 @@ use itertools::Itertools; use plonky2::field::batch_util::batch_multiply_inplace; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; diff --git a/starky/src/prover.rs b/starky/src/prover.rs index 2f8286b6..6cdb1384 100644 --- a/starky/src/prover.rs +++ b/starky/src/prover.rs @@ -4,7 +4,7 @@ use anyhow::{ensure, Result}; use itertools::Itertools; use plonky2::field::extension::Extendable; use plonky2::field::packable::Packable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues}; use plonky2::field::types::Field; use plonky2::field::zero_poly_coset::ZeroPolyOnCoset; diff --git a/starky/src/stark.rs b/starky/src/stark.rs index b81c1d08..df549572 100644 --- a/starky/src/stark.rs +++ b/starky/src/stark.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::fri::structure::{ FriBatchInfo, FriBatchInfoTarget, FriInstanceInfo, FriInstanceInfoTarget, FriOracleInfo, FriPolynomialInfo, diff --git a/starky/src/vanishing_poly.rs b/starky/src/vanishing_poly.rs index 01b71231..906b8980 100644 --- a/starky/src/vanishing_poly.rs +++ b/starky/src/vanishing_poly.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; use plonky2::plonk::config::GenericConfig; diff --git a/starky/src/vars.rs b/starky/src/vars.rs index 0ed013e7..682ac837 100644 --- a/starky/src/vars.rs +++ b/starky/src/vars.rs @@ -1,4 +1,4 @@ -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/addition.rs b/system_zero/src/alu/addition.rs index 93b3316b..3810482c 100644 --- a/system_zero/src/alu/addition.rs +++ b/system_zero/src/alu/addition.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/bitops.rs b/system_zero/src/alu/bitops.rs index aa2d23b9..1f9875ca 100644 --- a/system_zero/src/alu/bitops.rs +++ b/system_zero/src/alu/bitops.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/canonical.rs b/system_zero/src/alu/canonical.rs index dae04e30..bbc9e1a0 100644 --- a/system_zero/src/alu/canonical.rs +++ b/system_zero/src/alu/canonical.rs @@ -3,7 +3,7 @@ //! See https://hackmd.io/NC-yRmmtRQSvToTHb96e8Q#Checking-element-validity use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::Field; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/division.rs b/system_zero/src/alu/division.rs index d95fda6d..65bedd8f 100644 --- a/system_zero/src/alu/division.rs +++ b/system_zero/src/alu/division.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/mod.rs b/system_zero/src/alu/mod.rs index dea709f7..33f5e902 100644 --- a/system_zero/src/alu/mod.rs +++ b/system_zero/src/alu/mod.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/alu/mul_add.rs b/system_zero/src/alu/mul_add.rs index 3166017d..39484bf8 100644 --- a/system_zero/src/alu/mul_add.rs +++ b/system_zero/src/alu/mul_add.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/rotate_shift.rs b/system_zero/src/alu/rotate_shift.rs index ea35dfb3..87d54f0c 100644 --- a/system_zero/src/alu/rotate_shift.rs +++ b/system_zero/src/alu/rotate_shift.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/alu/subtraction.rs b/system_zero/src/alu/subtraction.rs index 99678cc1..dd83cbda 100644 --- a/system_zero/src/alu/subtraction.rs +++ b/system_zero/src/alu/subtraction.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::iop::ext_target::ExtensionTarget; diff --git a/system_zero/src/core_registers.rs b/system_zero/src/core_registers.rs index 56eb8fd7..3cf7843d 100644 --- a/system_zero/src/core_registers.rs +++ b/system_zero/src/core_registers.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/lookup.rs b/system_zero/src/lookup.rs index b8e6158e..c4036424 100644 --- a/system_zero/src/lookup.rs +++ b/system_zero/src/lookup.rs @@ -8,7 +8,7 @@ use std::cmp::Ordering; use itertools::Itertools; use plonky2::field::extension::Extendable; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::types::{Field, PrimeField64}; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/system_zero/src/permutation_unit.rs b/system_zero/src/permutation_unit.rs index e5235026..c94e1677 100644 --- a/system_zero/src/permutation_unit.rs +++ b/system_zero/src/permutation_unit.rs @@ -1,5 +1,5 @@ use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::hash::hash_types::RichField; use plonky2::hash::hashing::SPONGE_WIDTH; use plonky2::hash::poseidon::{Poseidon, HALF_N_FULL_ROUNDS, N_PARTIAL_ROUNDS}; diff --git a/system_zero/src/system_zero.rs b/system_zero/src/system_zero.rs index bfd07563..19c2df8c 100644 --- a/system_zero/src/system_zero.rs +++ b/system_zero/src/system_zero.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use plonky2::field::extension::{Extendable, FieldExtension}; -use plonky2::field::packed_field::PackedField; +use plonky2::field::packed::PackedField; use plonky2::field::polynomial::PolynomialValues; use plonky2::hash::hash_types::RichField; use plonky2::plonk::circuit_builder::CircuitBuilder; diff --git a/u32/src/gates/arithmetic_u32.rs b/u32/src/gates/arithmetic_u32.rs index 5309be85..c46c9e47 100644 --- a/u32/src/gates/arithmetic_u32.rs +++ b/u32/src/gates/arithmetic_u32.rs @@ -17,7 +17,7 @@ use plonky2::plonk::vars::{ EvaluationVarsBasePacked, }; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; /// A gate to perform a basic mul-add on 32-bit values (we assume they are range-checked beforehand). diff --git a/u32/src/gates/comparison.rs b/u32/src/gates/comparison.rs index 3f942ec4..6af34208 100644 --- a/u32/src/gates/comparison.rs +++ b/u32/src/gates/comparison.rs @@ -16,7 +16,7 @@ use plonky2::plonk::vars::{ EvaluationVarsBasePacked, }; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::{Field, Field64}; use plonky2_util::{bits_u64, ceil_div_usize}; diff --git a/u32/src/gates/subtraction_u32.rs b/u32/src/gates/subtraction_u32.rs index 1ca0c8e1..3737de55 100644 --- a/u32/src/gates/subtraction_u32.rs +++ b/u32/src/gates/subtraction_u32.rs @@ -16,7 +16,7 @@ use plonky2::plonk::vars::{ EvaluationVarsBasePacked, }; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; /// A gate to perform a subtraction on 32-bit limbs: given `x`, `y`, and `borrow`, it returns diff --git a/waksman/src/gates/switch.rs b/waksman/src/gates/switch.rs index e760a633..2c2ca8c8 100644 --- a/waksman/src/gates/switch.rs +++ b/waksman/src/gates/switch.rs @@ -17,7 +17,7 @@ use plonky2::plonk::vars::{ EvaluationVarsBasePacked, }; use plonky2_field::extension::Extendable; -use plonky2_field::packed_field::PackedField; +use plonky2_field::packed::PackedField; use plonky2_field::types::Field; /// A gate for conditionally swapping input values based on a boolean.