reformat imports

zk-token-sdk/src/instruction/close_account.rs

@@ -146,9 +146,13 @@ impl CloseAccountProof {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use {
-    use crate::encryption::elgamal::ElGamalKeypair;
+        super::*,
-    use crate::encryption::pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening};
+        crate::encryption::{
+            elgamal::ElGamalKeypair,
+            pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening},
+        },
+    };
 
     #[test]
     fn test_close_account_correctness() {

zk-token-sdk/src/instruction/transfer.rs

@@ -480,8 +480,7 @@ pub fn combine_u32_ciphertexts(ct_lo: ElGamalCiphertext, ct_hi: ElGamalCiphertex
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use {super::*, crate::encryption::elgamal::ElGamalKeypair};
-    use crate::encryption::elgamal::ElGamalKeypair;
 
     #[test]
     fn test_transfer_correctness() {

zk-token-sdk/src/instruction/withdraw.rs

@@ -172,8 +172,7 @@ impl WithdrawProof {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use {super::*, crate::encryption::elgamal::ElGamalKeypair};
-    use crate::encryption::elgamal::ElGamalKeypair;
 
     #[test]
     #[ignore]

zk-token-sdk/src/range_proof/inner_product.rs

@@ -1,15 +1,14 @@
-use core::iter;
+use {
-use std::borrow::Borrow;
+    crate::{errors::ProofError, range_proof::util, transcript::TranscriptProtocol},
-
+    core::iter,
-use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
+    curve25519_dalek::{
-use curve25519_dalek::scalar::Scalar;
+        ristretto::{CompressedRistretto, RistrettoPoint},
-use curve25519_dalek::traits::VartimeMultiscalarMul;
+        scalar::Scalar,
-
+        traits::VartimeMultiscalarMul,
-use crate::errors::ProofError;
+    },
-use crate::range_proof::util;
+    merlin::Transcript,
-use crate::transcript::TranscriptProtocol;
+    std::borrow::Borrow,
-
+};
-use merlin::Transcript;
 
 #[allow(non_snake_case)]
 #[derive(Clone)]

zk-token-sdk/src/range_proof/mod.rs

@@ -7,8 +7,9 @@ use {
 };
 use {
     crate::{
-        encryption::pedersen::PedersenBase, errors::ProofError,
+        encryption::pedersen::PedersenBase,
-        range_proof::generators::BulletproofGens, range_proof::inner_product::InnerProductProof,
+        errors::ProofError,
+        range_proof::{generators::BulletproofGens, inner_product::InnerProductProof},
         transcript::TranscriptProtocol,
     },
     core::iter,

zk-token-sdk/src/transcript.rs

@@ -1,10 +1,8 @@
-use curve25519_dalek::ristretto::CompressedRistretto;
+use {
-use curve25519_dalek::scalar::Scalar;
+    crate::errors::ProofError,
-use curve25519_dalek::traits::IsIdentity;
+    curve25519_dalek::{ristretto::CompressedRistretto, scalar::Scalar, traits::IsIdentity},
-
+    merlin::Transcript,
-use merlin::Transcript;
+};
-
-use crate::errors::ProofError;
 
 pub trait TranscriptProtocol {
     /// Append a domain separator for an `n`-bit rangeproof for ElGamalKeypair

zk-token-sdk/src/zk_token_elgamal/convert.rs

@@ -15,9 +15,11 @@ mod target_arch {
     use {
         super::pod,
         crate::{
-            encryption::aes::AesCiphertext,
+            encryption::{
-            encryption::elgamal::{ElGamalCiphertext, ElGamalPubkey},
+                aes::AesCiphertext,
-            encryption::pedersen::{PedersenCommitment, PedersenDecryptHandle},
+                elgamal::{ElGamalCiphertext, ElGamalPubkey},
+                pedersen::{PedersenCommitment, PedersenDecryptHandle},
+            },
             errors::ProofError,
             range_proof::RangeProof,
         },

zk-token-sdk/src/zk_token_elgamal/pod.rs

@@ -1,6 +1,5 @@
-use std::fmt;
-
 pub use bytemuck::{Pod, Zeroable};
+use std::fmt;
 
 #[derive(Clone, Copy, Pod, Zeroable, PartialEq)]
 #[repr(transparent)]

zk-token-sdk/src/zk_token_proof_instruction.rs

@@ -1,6 +1,5 @@
 ///! Instructions provided by the ZkToken Proof program
 pub use crate::instruction::*;
-
 use {
     bytemuck::{bytes_of, Pod},
     num_derive::{FromPrimitive, ToPrimitive},