fix: remove unstable features from plonky2

Signed-off-by: Brandon H. Gomes <[email protected]>

Author: bhgomes

ecdsa/src/curve/curve_msm.rs

@@ -1,6 +1,5 @@
 use itertools::Itertools;
-use plonky2_field::types::Field;
-use plonky2_field::types::PrimeField;
+use plonky2_field::types::{Field, PrimeField};
 use rayon::prelude::*;
 
 use crate::curve::curve_summation::affine_multisummation_best;
@@ -188,8 +187,7 @@ pub(crate) fn to_digits<C: Curve>(x: &C::ScalarField, w: usize) -> Vec<usize> {
 mod tests {
     use num::BigUint;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
-    use plonky2_field::types::Field;
-    use plonky2_field::types::PrimeField;
+    use plonky2_field::types::{Field, PrimeField};
 
     use crate::curve::curve_msm::{msm_execute, msm_precompute, to_digits};
     use crate::curve::curve_types::Curve;

ecdsa/src/curve/curve_multiplication.rs

@@ -1,7 +1,6 @@
 use std::ops::Mul;
 
-use plonky2_field::types::Field;
-use plonky2_field::types::PrimeField;
+use plonky2_field::types::{Field, PrimeField};
 
 use crate::curve::curve_types::{Curve, CurveScalar, ProjectivePoint};
 

ecdsa/src/curve/secp256k1.rs

@@ -41,8 +41,7 @@ const SECP256K1_GENERATOR_Y: Secp256K1Base = Secp256K1Base([
 mod tests {
     use num::BigUint;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
-    use plonky2_field::types::Field;
-    use plonky2_field::types::PrimeField;
+    use plonky2_field::types::{Field, PrimeField};
 
     use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/gadgets/biguint.rs

@@ -346,11 +346,10 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
 mod tests {
     use anyhow::Result;
     use num::{BigUint, FromPrimitive, Integer};
+    use plonky2::iop::witness::PartialWitness;
+    use plonky2::plonk::circuit_builder::CircuitBuilder;
+    use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2::{
-        iop::witness::PartialWitness,
-        plonk::{circuit_builder::CircuitBuilder, circuit_data::CircuitConfig},
-    };
     use rand::Rng;
 
     use crate::gadgets::biguint::{CircuitBuilderBiguint, WitnessBigUint};

ecdsa/src/gadgets/curve_fixed_base.rs

@@ -71,8 +71,7 @@ mod tests {
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
-    use plonky2_field::types::Field;
-    use plonky2_field::types::PrimeField;
+    use plonky2_field::types::{Field, PrimeField};
 
     use crate::curve::curve_types::{Curve, CurveScalar};
     use crate::curve::secp256k1::Secp256K1;

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::types::PrimeField;
-use plonky2_field::{extension::Extendable, types::Field};
+use plonky2_field::extension::Extendable;
+use plonky2_field::types::{Field, PrimeField};
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use plonky2_u32::gadgets::range_check::range_check_u32_circuit;
 use plonky2_u32::witness::GeneratedValuesU32;

evm/src/arithmetic/arithmetic_stark.rs

@@ -6,12 +6,7 @@ use plonky2::field::extension::{Extendable, FieldExtension};
 use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 
-use crate::arithmetic::add;
-use crate::arithmetic::columns;
-use crate::arithmetic::compare;
-use crate::arithmetic::modular;
-use crate::arithmetic::mul;
-use crate::arithmetic::sub;
+use crate::arithmetic::{add, columns, compare, modular, mul, sub};
 use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer};
 use crate::stark::Stark;
 use crate::vars::{StarkEvaluationTargets, StarkEvaluationVars};

evm/src/arithmetic/modular.rs

@@ -87,7 +87,8 @@
 //! In the case of DIV, we do something similar, except that we "replace"
 //! the modulus with "2^256" to force the quotient to be zero.
 
-use num::{bigint::Sign, BigInt, One, Zero};
+use num::bigint::Sign;
+use num::{BigInt, One, Zero};
 use plonky2::field::extension::Extendable;
 use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;

evm/src/bin/assemble.rs

@@ -1,5 +1,4 @@
-use std::env;
-use std::fs;
+use std::{env, fs};
 
 use hex::encode;
 use plonky2_evm::cpu::kernel::assemble_to_bytes;

evm/src/cpu/kernel/assembler.rs

@@ -7,15 +7,12 @@ use plonky2_util::ceil_div_usize;
 
 use super::ast::PushTarget;
 use crate::cpu::kernel::ast::Item::LocalLabelDeclaration;
-use crate::cpu::kernel::ast::StackReplacement;
+use crate::cpu::kernel::ast::{File, Item, StackReplacement};
 use crate::cpu::kernel::keccak_util::hash_kernel;
+use crate::cpu::kernel::opcodes::{get_opcode, get_push_opcode};
 use crate::cpu::kernel::optimizer::optimize_asm;
 use crate::cpu::kernel::stack::stack_manipulation::expand_stack_manipulation;
 use crate::cpu::kernel::utils::u256_to_trimmed_be_bytes;
-use crate::cpu::kernel::{
-    ast::{File, Item},
-    opcodes::{get_opcode, get_push_opcode},
-};
 use crate::generation::prover_input::ProverInputFn;
 use crate::keccak_sponge::columns::KECCAK_RATE_BYTES;
 
@@ -374,8 +371,9 @@ mod tests {
 
     use itertools::Itertools;
 
+    use crate::cpu::kernel::assembler::*;
+    use crate::cpu::kernel::ast::*;
     use crate::cpu::kernel::parser::parse;
-    use crate::cpu::kernel::{assembler::*, ast::*};
 
     #[test]
     fn two_files() {