From 5361a78ab5a0f4e824db98842b8c0aa5ea60a56d Mon Sep 17 00:00:00 2001
From: Neotamandua <107320179+Neotamandua@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:47:53 +0200
Subject: [PATCH] test-wallet: reorder imports to align with convention

---
 test-wallet/src/imp.rs | 55 +++++++++++++++++++-----------------------
 test-wallet/src/lib.rs | 22 ++++++++---------
 2 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/test-wallet/src/imp.rs b/test-wallet/src/imp.rs
index 78f9ff50e8..4cbd6e5479 100644
--- a/test-wallet/src/imp.rs
+++ b/test-wallet/src/imp.rs
@@ -4,47 +4,42 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use crate::{StateClient, Store};
-
-use core::convert::Infallible;
-
 use alloc::string::FromUtf8Error;
 use alloc::vec::Vec;
+use core::convert::Infallible;
 
 use dusk_bytes::Error as BytesError;
+use execution_core::signatures::bls::{
+    PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
+};
+use execution_core::stake::StakeData;
+use execution_core::transfer::data::TransactionData;
+use execution_core::transfer::moonlight::{
+    AccountData, Transaction as MoonlightTransaction,
+};
+use execution_core::transfer::phoenix::{
+    Note, NoteLeaf, NoteOpening, PublicKey as PhoenixPublicKey,
+    SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
+};
+use execution_core::transfer::Transaction;
+use execution_core::{BlsScalar, Error as ExecutionError};
 use rand::{CryptoRng, Error as RngError, RngCore};
 use rkyv::ser::serializers::{
     AllocScratchError, CompositeSerializerError, SharedSerializeMapError,
 };
 use rkyv::validation::validators::CheckDeserializeError;
-use zeroize::Zeroize;
-
-use execution_core::{
-    signatures::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey},
-    stake::StakeData,
-    transfer::{
-        data::TransactionData,
-        moonlight::{AccountData, Transaction as MoonlightTransaction},
-        phoenix::{
-            Note, NoteLeaf, NoteOpening, PublicKey as PhoenixPublicKey,
-            SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
-        },
-        Transaction,
-    },
-    BlsScalar, Error as ExecutionError,
-};
 use rusk_prover::LocalProver;
-use wallet_core::{
-    keys::{derive_bls_sk, derive_phoenix_sk},
-    phoenix_balance,
-    transaction::{
-        moonlight_deployment, moonlight_stake, moonlight_stake_reward,
-        moonlight_to_phoenix, moonlight_unstake,
-        phoenix as phoenix_transaction, phoenix_deployment, phoenix_stake,
-        phoenix_stake_reward, phoenix_to_moonlight, phoenix_unstake,
-    },
-    BalanceInfo,
+use wallet_core::keys::{derive_bls_sk, derive_phoenix_sk};
+use wallet_core::transaction::{
+    moonlight_deployment, moonlight_stake, moonlight_stake_reward,
+    moonlight_to_phoenix, moonlight_unstake, phoenix as phoenix_transaction,
+    phoenix_deployment, phoenix_stake, phoenix_stake_reward,
+    phoenix_to_moonlight, phoenix_unstake,
 };
+use wallet_core::{phoenix_balance, BalanceInfo};
+use zeroize::Zeroize;
+
+use crate::{StateClient, Store};
 
 const MAX_INPUT_NOTES: usize = 4;
 
diff --git a/test-wallet/src/lib.rs b/test-wallet/src/lib.rs
index a5b9aebdcb..25a0c884e3 100644
--- a/test-wallet/src/lib.rs
+++ b/test-wallet/src/lib.rs
@@ -15,20 +15,18 @@ extern crate alloc;
 mod imp;
 
 use alloc::vec::Vec;
-use zeroize::Zeroize;
 
-use execution_core::{
-    signatures::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey},
-    stake::StakeData,
-    transfer::{
-        moonlight::AccountData,
-        phoenix::{
-            Note, NoteOpening, PublicKey as PhoenixPublicKey,
-            SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
-        },
-    },
-    BlsScalar,
+use execution_core::signatures::bls::{
+    PublicKey as BlsPublicKey, SecretKey as BlsSecretKey,
+};
+use execution_core::stake::StakeData;
+use execution_core::transfer::moonlight::AccountData;
+use execution_core::transfer::phoenix::{
+    Note, NoteOpening, PublicKey as PhoenixPublicKey,
+    SecretKey as PhoenixSecretKey, ViewKey as PhoenixViewKey,
 };
+use execution_core::BlsScalar;
+use zeroize::Zeroize;
 
 pub use wallet_core::keys::{
     derive_bls_sk, derive_phoenix_pk, derive_phoenix_sk,