From 35c864368105e43a7430b9b4cae1d966ff5c95ee Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Sun, 18 Jul 2021 23:31:08 -0700 Subject: [PATCH] Tiny cleanup --- src/field/extension_field/quartic.rs | 2 +- src/gadgets/arithmetic_extension.rs | 4 +--- src/gadgets/rotate.rs | 5 +++-- src/gates/gate_testing.rs | 2 +- src/gates/gmimc.rs | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/field/extension_field/quartic.rs b/src/field/extension_field/quartic.rs index 22e91353..9390c521 100644 --- a/src/field/extension_field/quartic.rs +++ b/src/field/extension_field/quartic.rs @@ -247,7 +247,7 @@ impl DivAssign for QuarticCrandallField { #[cfg(test)] mod tests { use crate::field::extension_field::quartic::QuarticCrandallField; - use crate::field::extension_field::{FieldExtension, Frobenius, OEF}; + use crate::field::extension_field::{FieldExtension, Frobenius}; use crate::field::field::Field; fn exp_naive(x: F, power: u128) -> F { diff --git a/src/gadgets/arithmetic_extension.rs b/src/gadgets/arithmetic_extension.rs index dfe63653..10b60dcd 100644 --- a/src/gadgets/arithmetic_extension.rs +++ b/src/gadgets/arithmetic_extension.rs @@ -1,5 +1,4 @@ -use std::convert::{TryFrom, TryInto}; -use std::ops::Range; +use std::convert::TryInto; use itertools::Itertools; use num::Integer; @@ -7,7 +6,6 @@ use num::Integer; use crate::circuit_builder::CircuitBuilder; use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget}; use crate::field::extension_field::{Extendable, OEF}; -use crate::field::field::Field; use crate::gates::arithmetic::ArithmeticExtensionGate; use crate::generator::SimpleGenerator; use crate::target::Target; diff --git a/src/gadgets/rotate.rs b/src/gadgets/rotate.rs index 67b53c9c..67677795 100644 --- a/src/gadgets/rotate.rs +++ b/src/gadgets/rotate.rs @@ -158,9 +158,10 @@ mod tests { } #[test] - fn test_rotate() { + fn test_rotate() -> Result<()> { for len in 1..5 { - test_rotate_given_len(len); + test_rotate_given_len(len)?; } + Ok(()) } } diff --git a/src/gates/gate_testing.rs b/src/gates/gate_testing.rs index a6345249..cb25acb8 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::GateRef; use crate::polynomial::polynomial::{PolynomialCoeffs, PolynomialValues}; use crate::util::{log2_ceil, transpose}; use crate::vars::EvaluationVars; diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs index 316ec524..768a5693 100644 --- a/src/gates/gmimc.rs +++ b/src/gates/gmimc.rs @@ -421,7 +421,7 @@ mod tests { local_wires: &wires, }; - let ev = gate.0.eval_unfiltered((vars)); + let ev = gate.0.eval_unfiltered(vars); let wires_t = builder.add_virtual_extension_targets(Gate::end()); for i in 0..Gate::end() {