diff --git a/Cargo.toml b/Cargo.toml index 5df8715091..d943bdeb7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,6 @@ members = [ "node", "rusk-wallet", - # Test utils - "test-wallet", ] resolver = "2" diff --git a/rusk/Cargo.toml b/rusk/Cargo.toml index cf9a03d267..8f27a84c1f 100644 --- a/rusk/Cargo.toml +++ b/rusk/Cargo.toml @@ -82,7 +82,8 @@ rusk-recovery = { workspace = true, optional = true } futures = { workspace = true, optional = true } [dev-dependencies] -test-wallet = { version = "0.1.0", path = "../test-wallet" } +wallet-core = { workspace = true } +zeroize = { workspace = true, features = ["derive"] } rusk-recovery = { workspace = true, features = ["state"] } ff = { workspace = true } rusk-prover = { workspace = true, features = ["no_random", "debug"] } diff --git a/rusk/benches/block_ingestion.rs b/rusk/benches/block_ingestion.rs index 97e282bea9..0afabed639 100644 --- a/rusk/benches/block_ingestion.rs +++ b/rusk/benches/block_ingestion.rs @@ -5,6 +5,7 @@ // Copyright (c) DUSK NETWORK. All rights reserved. #![feature(lazy_cell)] +extern crate alloc; #[path = "../tests/common/mod.rs"] mod common; diff --git a/rusk/tests/common/wallet.rs b/rusk/tests/common/wallet.rs index 4cb908e651..07d0510f4c 100644 --- a/rusk/tests/common/wallet.rs +++ b/rusk/tests/common/wallet.rs @@ -4,6 +4,8 @@ // // Copyright (c) DUSK NETWORK. All rights reserved. +pub mod test_wallet; + use std::collections::HashMap; use std::fmt::Debug; use std::sync::{Arc, RwLock}; @@ -25,6 +27,8 @@ use rusk::{Error, Result, Rusk}; use test_wallet::{self as wallet, Store}; use tracing::info; +pub use test_wallet::Wallet; + #[derive(Debug, Clone)] pub struct TestStore; diff --git a/test-wallet/src/lib.rs b/rusk/tests/common/wallet/test_wallet.rs similarity index 99% rename from test-wallet/src/lib.rs rename to rusk/tests/common/wallet/test_wallet.rs index ce399123d1..a4f56f2f64 100644 --- a/test-wallet/src/lib.rs +++ b/rusk/tests/common/wallet/test_wallet.rs @@ -32,7 +32,7 @@ pub use wallet_core::keys::{ derive_bls_sk, derive_phoenix_pk, derive_phoenix_sk, }; -pub use imp::*; +pub use imp::Wallet; /// Stores the cryptographic material necessary to derive cryptographic keys. pub trait Store { diff --git a/test-wallet/src/imp.rs b/rusk/tests/common/wallet/test_wallet/imp.rs similarity index 99% rename from test-wallet/src/imp.rs rename to rusk/tests/common/wallet/test_wallet/imp.rs index 98be4ff899..c6a924899f 100644 --- a/test-wallet/src/imp.rs +++ b/rusk/tests/common/wallet/test_wallet/imp.rs @@ -4,9 +4,8 @@ // // Copyright (c) DUSK NETWORK. All rights reserved. -use alloc::string::FromUtf8Error; -use alloc::vec::Vec; use core::convert::Infallible; +use std::string::FromUtf8Error; use dusk_bytes::Error as BytesError; use dusk_core::signatures::bls::{ @@ -30,6 +29,7 @@ use rkyv::ser::serializers::{ use rkyv::validation::validators::CheckDeserializeError; use rusk_prover::LocalProver; use wallet_core::keys::{derive_bls_sk, derive_phoenix_sk}; +// use wallet_core::prelude::*; use wallet_core::transaction::{ moonlight, moonlight_deployment, moonlight_stake, moonlight_stake_reward, moonlight_to_phoenix, moonlight_unstake, phoenix as phoenix_transaction, @@ -39,7 +39,7 @@ use wallet_core::transaction::{ use wallet_core::{phoenix_balance, BalanceInfo}; use zeroize::Zeroize; -use crate::{StateClient, Store}; +use super::{StateClient, Store}; const MAX_INPUT_NOTES: usize = 4; diff --git a/rusk/tests/rusk-state.rs b/rusk/tests/rusk-state.rs index d9d687d296..93b72e9406 100644 --- a/rusk/tests/rusk-state.rs +++ b/rusk/tests/rusk-state.rs @@ -191,7 +191,7 @@ async fn generate_phoenix_txs() -> Result<(), Box> { Arc::new(std::sync::RwLock::new(std::collections::HashMap::new())); let wallet = - test_wallet::Wallet::new(TestStore, TestStateClient { rusk, cache }); + crate::wallet::Wallet::new(TestStore, TestStateClient { rusk, cache }); const N_ADDRESSES: usize = 100; @@ -253,7 +253,7 @@ async fn generate_moonlight_txs() -> Result<(), Box> { Arc::new(std::sync::RwLock::new(std::collections::HashMap::new())); let wallet = - test_wallet::Wallet::new(TestStore, TestStateClient { rusk, cache }); + crate::wallet::Wallet::new(TestStore, TestStateClient { rusk, cache }); const N_ADDRESSES: usize = 100; diff --git a/rusk/tests/services/contract_deployment.rs b/rusk/tests/services/contract_deployment.rs index 3a346a8f2e..2a4a510e75 100644 --- a/rusk/tests/services/contract_deployment.rs +++ b/rusk/tests/services/contract_deployment.rs @@ -18,7 +18,6 @@ use rand::rngs::StdRng; use rusk::{Result, Rusk, DUSK_CONSENSUS_KEY}; use rusk_recovery_tools::state; use tempfile::tempdir; -use test_wallet::{self as wallet, Wallet}; use tokio::sync::broadcast; use tracing::info; @@ -29,7 +28,9 @@ use crate::common::state::{generator_procedure, ExecuteResult}; use crate::common::state::{ DEFAULT_GAS_PER_DEPLOY_BYTE, DEFAULT_MIN_GAS_LIMIT, }; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, Wallet, +}; const BLOCK_HEIGHT: u64 = 1; const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000; diff --git a/rusk/tests/services/contract_stake.rs b/rusk/tests/services/contract_stake.rs index 90bee3616e..2f137fdf56 100644 --- a/rusk/tests/services/contract_stake.rs +++ b/rusk/tests/services/contract_stake.rs @@ -20,11 +20,12 @@ use rand::rngs::StdRng; use rusk::{Result, Rusk}; use std::collections::HashMap; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::state::{generator_procedure2, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; use crate::common::*; const BLOCK_HEIGHT: u64 = 1; diff --git a/rusk/tests/services/conversion.rs b/rusk/tests/services/conversion.rs index 41ea664552..b038cc9400 100644 --- a/rusk/tests/services/conversion.rs +++ b/rusk/tests/services/conversion.rs @@ -13,11 +13,12 @@ use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; use tempfile::tempdir; -use test_wallet::{self as wallet}; use crate::common::logger; use crate::common::state::{generator_procedure, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; const BLOCK_GAS_LIMIT: u64 = 100_000_000_000; diff --git a/rusk/tests/services/gas_behavior.rs b/rusk/tests/services/gas_behavior.rs index 478b004eb9..e552f3d983 100644 --- a/rusk/tests/services/gas_behavior.rs +++ b/rusk/tests/services/gas_behavior.rs @@ -16,12 +16,13 @@ use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::logger; use crate::common::state::{generator_procedure, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; const BLOCK_HEIGHT: u64 = 1; const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000; diff --git a/rusk/tests/services/moonlight_stake.rs b/rusk/tests/services/moonlight_stake.rs index f28cc26c86..a4fee5b358 100644 --- a/rusk/tests/services/moonlight_stake.rs +++ b/rusk/tests/services/moonlight_stake.rs @@ -14,11 +14,12 @@ use rand::rngs::StdRng; use rusk::{Result, Rusk}; use std::collections::HashMap; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::state::{generator_procedure, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; use crate::common::*; const BLOCK_HEIGHT: u64 = 1; diff --git a/rusk/tests/services/multi_transfer.rs b/rusk/tests/services/multi_transfer.rs index 4761f2b70c..689a290a7f 100644 --- a/rusk/tests/services/multi_transfer.rs +++ b/rusk/tests/services/multi_transfer.rs @@ -12,12 +12,13 @@ use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::logger; use crate::common::state::{generator_procedure, new_state, ExecuteResult}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; const BLOCK_HEIGHT: u64 = 1; // This is purposefully chosen to be low to trigger the discarding of a diff --git a/rusk/tests/services/owner_calls.rs b/rusk/tests/services/owner_calls.rs index b8f895db18..adaac088bb 100644 --- a/rusk/tests/services/owner_calls.rs +++ b/rusk/tests/services/owner_calls.rs @@ -23,7 +23,6 @@ use dusk_vm::{gen_contract_id, CallReceipt, ContractData, Session, VM}; use rusk::{Error, Result, Rusk}; use rusk_recovery_tools::state; use tempfile::tempdir; -use test_wallet::{self as wallet, Wallet}; use tokio::sync::broadcast; use tracing::info; @@ -33,7 +32,9 @@ use crate::common::state::DEFAULT_MIN_DEPLOY_POINTS; use crate::common::state::{ DEFAULT_GAS_PER_DEPLOY_BYTE, DEFAULT_MIN_GAS_LIMIT, }; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, test_wallet::Wallet, TestStateClient, TestStore, +}; const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000; const POINT_LIMIT: u64 = 0x10000000; diff --git a/rusk/tests/services/phoenix_stake.rs b/rusk/tests/services/phoenix_stake.rs index aa83b51345..f0c3318e4a 100644 --- a/rusk/tests/services/phoenix_stake.rs +++ b/rusk/tests/services/phoenix_stake.rs @@ -20,11 +20,12 @@ use rand::rngs::StdRng; use rusk::{Result, Rusk}; use std::collections::HashMap; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::state::{generator_procedure, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; use crate::common::*; const BLOCK_HEIGHT: u64 = 1; diff --git a/rusk/tests/services/transfer.rs b/rusk/tests/services/transfer.rs index c618119e9d..8655407301 100644 --- a/rusk/tests/services/transfer.rs +++ b/rusk/tests/services/transfer.rs @@ -13,12 +13,13 @@ use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::logger; use crate::common::state::{generator_procedure, new_state}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; const BLOCK_GAS_LIMIT: u64 = 100_000_000_000; const INITIAL_BALANCE: u64 = 10_000_000_000; diff --git a/rusk/tests/services/unspendable.rs b/rusk/tests/services/unspendable.rs index daa8932f7e..0d425c2697 100644 --- a/rusk/tests/services/unspendable.rs +++ b/rusk/tests/services/unspendable.rs @@ -16,12 +16,13 @@ use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; use tempfile::tempdir; -use test_wallet::{self as wallet}; use tracing::info; use crate::common::logger; use crate::common::state::{generator_procedure, new_state, ExecuteResult}; -use crate::common::wallet::{TestStateClient, TestStore}; +use crate::common::wallet::{ + test_wallet as wallet, TestStateClient, TestStore, +}; const BLOCK_HEIGHT: u64 = 1; const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000; diff --git a/rusk/tests/tests.rs b/rusk/tests/tests.rs index a4dd97f5a5..3b24fd87b2 100644 --- a/rusk/tests/tests.rs +++ b/rusk/tests/tests.rs @@ -7,3 +7,5 @@ #![feature(lazy_cell)] mod common; mod services; + +extern crate alloc; diff --git a/test-wallet/Cargo.toml b/test-wallet/Cargo.toml deleted file mode 100644 index 139faad839..0000000000 --- a/test-wallet/Cargo.toml +++ /dev/null @@ -1,22 +0,0 @@ -[package] -name = "test-wallet" -version = "0.1.0" -edition = "2021" -description = "Test wallet used for Rusk" -license = "MPL-2.0" - -[dependencies] -rand = { workspace = true } -dusk-bytes = { workspace = true } -rkyv = { workspace = true } -ff = { workspace = true } -zeroize = { workspace = true, features = ["derive"] } - -dusk-core = { workspace = true } -wallet-core = { workspace = true } -rusk-prover = { workspace = true } - -[dev-dependencies] - -[lib] -crate-type = ["cdylib", "rlib"]