From 191b5df0cb842f498ccd1efae6a38590eebedde3 Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Thu, 27 Jan 2022 08:09:29 +0800
Subject: [PATCH] circuit.rs: Tidy up imports.

---
 src/circuit.rs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/circuit.rs b/src/circuit.rs
index a5da1f21..8e2bab99 100644
--- a/src/circuit.rs
+++ b/src/circuit.rs
@@ -11,6 +11,23 @@ use memuse::DynamicUsage;
 use pasta_curves::{arithmetic::CurveAffine, pallas, vesta};
 use rand::RngCore;
 
+use self::commit_ivk::CommitIvkConfig;
+use self::gadget::{
+    ecc::{
+        chip::{EccChip, EccConfig},
+        FixedPoint, FixedPointBaseField, FixedPointShort, NonIdentityPoint, Point,
+    },
+    poseidon::{Hash as PoseidonHash, Pow5Chip as PoseidonChip, Pow5Config as PoseidonConfig},
+    sinsemilla::{
+        chip::{SinsemillaChip, SinsemillaConfig},
+        merkle::{
+            chip::{MerkleChip, MerkleConfig},
+            MerklePath,
+        },
+    },
+    utilities::{lookup_range_check::LookupRangeCheckConfig, UtilitiesInstructions},
+};
+use self::note_commit::NoteCommitConfig;
 use crate::{
     constants::{
         util::gen_const_array, NullifierK, OrchardCommitDomains, OrchardFixedBases,
@@ -32,23 +49,6 @@ use crate::{
     tree::{Anchor, MerkleHashOrchard},
     value::{NoteValue, ValueCommitTrapdoor, ValueCommitment},
 };
-use commit_ivk::CommitIvkConfig;
-use gadget::{
-    ecc::{
-        chip::{EccChip, EccConfig},
-        FixedPoint, FixedPointBaseField, FixedPointShort, NonIdentityPoint, Point,
-    },
-    poseidon::{Hash as PoseidonHash, Pow5Chip as PoseidonChip, Pow5Config as PoseidonConfig},
-    sinsemilla::{
-        chip::{SinsemillaChip, SinsemillaConfig},
-        merkle::{
-            chip::{MerkleChip, MerkleConfig},
-            MerklePath,
-        },
-    },
-    utilities::{lookup_range_check::LookupRangeCheckConfig, UtilitiesInstructions},
-};
-use note_commit::NoteCommitConfig;
 
 use std::convert::TryInto;