From e382decc9fb57d7c2b390e2a2b58bfaaa555c458 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Thu, 29 Jul 2021 11:45:58 -0700 Subject: [PATCH] Import fixes --- src/field/crandall_field.rs | 1 - src/field/extension_field/quadratic.rs | 1 - src/field/extension_field/quartic.rs | 1 - src/field/field_testing.rs | 2 +- src/gadgets/insert.rs | 2 -- src/gates/base_sum.rs | 3 +-- src/gates/constant.rs | 2 +- src/gates/exponentiation.rs | 2 +- src/gates/gate_testing.rs | 2 +- src/gates/gmimc.rs | 2 +- src/gates/interpolation.rs | 4 +--- src/gates/noop.rs | 2 +- src/gates/public_input.rs | 2 +- src/gates/reducing.rs | 1 - 14 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/field/crandall_field.rs b/src/field/crandall_field.rs index 051b0fd0..36cea17b 100644 --- a/src/field/crandall_field.rs +++ b/src/field/crandall_field.rs @@ -4,7 +4,6 @@ use std::hash::{Hash, Hasher}; use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; -use itertools::Itertools; use num::bigint::BigUint; use num::Integer; use rand::Rng; diff --git a/src/field/extension_field/quadratic.rs b/src/field/extension_field/quadratic.rs index 5324ad2a..fbbb535f 100644 --- a/src/field/extension_field/quadratic.rs +++ b/src/field/extension_field/quadratic.rs @@ -3,7 +3,6 @@ use std::hash::Hash; use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; -use itertools::Itertools; use num::bigint::BigUint; use rand::Rng; use serde::{Deserialize, Serialize}; diff --git a/src/field/extension_field/quartic.rs b/src/field/extension_field/quartic.rs index f38f103a..ef356232 100644 --- a/src/field/extension_field/quartic.rs +++ b/src/field/extension_field/quartic.rs @@ -3,7 +3,6 @@ use std::hash::Hash; use std::iter::{Product, Sum}; use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; -use itertools::Itertools; use num::bigint::BigUint; use num::traits::Pow; use rand::Rng; diff --git a/src/field/field_testing.rs b/src/field/field_testing.rs index ffab1d9d..d0930fb9 100644 --- a/src/field/field_testing.rs +++ b/src/field/field_testing.rs @@ -151,7 +151,7 @@ macro_rules! test_field_arithmetic { ($field:ty) => { mod field_arithmetic { use num::{bigint::BigUint, One, Zero}; - use rand::{thread_rng, Rng}; + use rand::Rng; use crate::field::field::Field; diff --git a/src/gadgets/insert.rs b/src/gadgets/insert.rs index 8406b83a..e9345ef7 100644 --- a/src/gadgets/insert.rs +++ b/src/gadgets/insert.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; diff --git a/src/gates/base_sum.rs b/src/gates/base_sum.rs index 3ec017f3..723cc84f 100644 --- a/src/gates/base_sum.rs +++ b/src/gates/base_sum.rs @@ -4,7 +4,7 @@ use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; use crate::field::field::Field; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::plonk_common::{reduce_with_powers, reduce_with_powers_ext_recursive}; use crate::target::Target; @@ -186,7 +186,6 @@ impl SimpleGenerator for BaseSplitGenerator { mod tests { use crate::field::crandall_field::CrandallField; use crate::gates::base_sum::BaseSumGate; - use crate::gates::gate::GateRef; use crate::gates::gate_testing::test_low_degree; #[test] diff --git a/src/gates/constant.rs b/src/gates/constant.rs index 1d8f50dd..11592c90 100644 --- a/src/gates/constant.rs +++ b/src/gates/constant.rs @@ -2,7 +2,7 @@ use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; use crate::field::field::Field; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::target::Target; use crate::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; diff --git a/src/gates/exponentiation.rs b/src/gates/exponentiation.rs index 900559e6..670f5365 100644 --- a/src/gates/exponentiation.rs +++ b/src/gates/exponentiation.rs @@ -279,7 +279,7 @@ impl, const D: usize> SimpleGenerator for ExponentiationGene mod tests { use std::marker::PhantomData; - use rand::{thread_rng, Rng}; + use rand::Rng; use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticCrandallField; diff --git a/src/gates/gate_testing.rs b/src/gates/gate_testing.rs index 4a6c80df..e0b72477 100644 --- a/src/gates/gate_testing.rs +++ b/src/gates/gate_testing.rs @@ -1,6 +1,6 @@ use crate::field::extension_field::Extendable; use crate::field::field::Field; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::polynomial::polynomial::{PolynomialCoeffs, PolynomialValues}; use crate::proof::Hash; use crate::util::{log2_ceil, transpose}; diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs index 2c8ca297..ec2aab6c 100644 --- a/src/gates/gmimc.rs +++ b/src/gates/gmimc.rs @@ -334,7 +334,7 @@ mod tests { use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticCrandallField; use crate::field::field::Field; - use crate::gates::gate::{Gate, GateRef}; + use crate::gates::gate::Gate; use crate::gates::gate_testing::test_low_degree; use crate::gates::gmimc::{GMiMCGate, W}; use crate::generator::generate_partial_witness; diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs index 47fa6d4a..36e90c53 100644 --- a/src/gates/interpolation.rs +++ b/src/gates/interpolation.rs @@ -8,7 +8,7 @@ use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::{Extendable, FieldExtension}; use crate::field::interpolation::interpolant; use crate::gadgets::polynomial::PolynomialCoeffsExtAlgebraTarget; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::generator::{GeneratedValues, SimpleGenerator, WitnessGenerator}; use crate::polynomial::polynomial::PolynomialCoeffs; use crate::target::Target; @@ -288,7 +288,6 @@ mod tests { use crate::field::crandall_field::CrandallField; use crate::field::extension_field::quartic::QuarticCrandallField; - use crate::field::extension_field::FieldExtension; use crate::field::field::Field; use crate::gates::gate::Gate; use crate::gates::gate_testing::test_low_degree; @@ -319,7 +318,6 @@ mod tests { #[test] fn low_degree() { - type F = CrandallField; test_low_degree::(InterpolationGate::new(4)); } diff --git a/src/gates/noop.rs b/src/gates/noop.rs index 0787c9fa..3245f7b7 100644 --- a/src/gates/noop.rs +++ b/src/gates/noop.rs @@ -1,7 +1,7 @@ use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::generator::WitnessGenerator; use crate::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; diff --git a/src/gates/public_input.rs b/src/gates/public_input.rs index e8299b26..ae9d2377 100644 --- a/src/gates/public_input.rs +++ b/src/gates/public_input.rs @@ -3,7 +3,7 @@ use std::ops::Range; use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::ExtensionTarget; use crate::field::extension_field::Extendable; -use crate::gates::gate::{Gate, GateRef}; +use crate::gates::gate::Gate; use crate::generator::WitnessGenerator; use crate::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase}; diff --git a/src/gates/reducing.rs b/src/gates/reducing.rs index 0129a156..cea7267a 100644 --- a/src/gates/reducing.rs +++ b/src/gates/reducing.rs @@ -219,7 +219,6 @@ mod tests { #[test] fn low_degree() { - type F = CrandallField; test_low_degree::(ReducingGate::new(22)); } }