Skip to content

Commit

Permalink
test-wallet: reorder imports to align with convention
Browse files Browse the repository at this point in the history
  • Loading branch information
Neotamandua committed Nov 25, 2024
1 parent 413b934 commit 5361a78
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 42 deletions.
55 changes: 25 additions & 30 deletions test-wallet/src/imp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
22 changes: 10 additions & 12 deletions test-wallet/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 5361a78

Please sign in to comment.