Put together some imports

QED-it · Jun 25, 2024 · 18e3e0d · 18e3e0d
1 parent cd4d43a
commit 18e3e0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/halo2_gadgets/src/sinsemilla/chip/generator_table.rs b/halo2_gadgets/src/sinsemilla/chip/generator_table.rs
@@ -6,9 +6,8 @@ use halo2_proofs::{
 };
 
 use super::{CommitDomains, FixedPoints, HashDomains};
-use crate::sinsemilla::primitives::K;
 use crate::{
-    sinsemilla::primitives::{self as sinsemilla, SINSEMILLA_S},
+    sinsemilla::primitives::{self as sinsemilla, K, SINSEMILLA_S},
     utilities::lookup_range_check::PallasLookupRangeCheck,
 };
 use pasta_curves::pallas;

diff --git a/halo2_gadgets/src/utilities/cond_swap.rs b/halo2_gadgets/src/utilities/cond_swap.rs
@@ -6,8 +6,7 @@ use crate::ecc::chip::{EccPoint, NonIdentityEccPoint};
 use group::ff::{Field, PrimeField};
 use halo2_proofs::{
     circuit::{AssignedCell, Chip, Layouter, Value},
-    plonk,
-    plonk::{Advice, Column, ConstraintSystem, Constraints, Error, Selector},
+    plonk::{self, Advice, Column, ConstraintSystem, Constraints, Error, Selector},
     poly::Rotation,
 };
 use pasta_curves::pallas;
@@ -298,10 +297,12 @@ impl<F: PrimeField> CondSwapChip<F> {
 
 #[cfg(test)]
 mod tests {
-    use super::super::UtilitiesInstructions;
-    use super::{CondSwapChip, CondSwapConfig, CondSwapInstructions};
-    use crate::utilities::lookup_range_check::{
-        PallasLookupRangeCheck, PallasLookupRangeCheck45BConfig, PallasLookupRangeCheckConfig,
+    use crate::utilities::{
+        cond_swap::{CondSwapChip, CondSwapConfig, CondSwapInstructions},
+        lookup_range_check::{
+            PallasLookupRangeCheck, PallasLookupRangeCheck45BConfig, PallasLookupRangeCheckConfig,
+        },
+        UtilitiesInstructions,
     };
     use group::ff::{Field, PrimeField};
     use halo2_proofs::{