From 2493c3028d874a006e62aace6c9e8af11ea0ba82 Mon Sep 17 00:00:00 2001 From: Emir Date: Thu, 1 Jun 2023 11:01:25 +0200 Subject: [PATCH] Refactor path for WalletUnlocked in fuels::accounts (#987) This PR modifies the path for the `WalletUnlocked` functionality in the `fuels::accounts`. The previous path, `fuels::accounts::WalletUnlocked`, has been disabled, and only the new path, `fuels::accounts::wallet::WalletUnlocked`, is now enabled. Co-authored-by: iqdecay --- examples/contracts/src/lib.rs | 1 + examples/cookbook/src/lib.rs | 1 + examples/predicates/src/lib.rs | 1 + examples/providers/src/lib.rs | 2 +- examples/wallets/src/lib.rs | 1 + packages/fuels-accounts/src/lib.rs | 1 - packages/fuels-core/src/codec/abi_decoder.rs | 2 +- packages/fuels-programs/src/call_utils.rs | 2 +- packages/fuels-test-helpers/src/accounts.rs | 4 +++- packages/fuels/src/lib.rs | 1 - packages/fuels/tests/contracts.rs | 2 +- packages/fuels/tests/predicates.rs | 2 +- packages/fuels/tests/providers.rs | 2 +- packages/fuels/tests/scripts.rs | 1 + packages/fuels/tests/types_predicates.rs | 2 +- packages/fuels/tests/wallets.rs | 4 +++- 16 files changed, 18 insertions(+), 11 deletions(-) diff --git a/examples/contracts/src/lib.rs b/examples/contracts/src/lib.rs index b58422d4de..0f549b3ab2 100644 --- a/examples/contracts/src/lib.rs +++ b/examples/contracts/src/lib.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod tests { + use fuels::accounts::wallet::WalletUnlocked; use fuels::types::errors::{error, Error, Result}; #[tokio::test] diff --git a/examples/cookbook/src/lib.rs b/examples/cookbook/src/lib.rs index accb4608b9..18eeae8902 100644 --- a/examples/cookbook/src/lib.rs +++ b/examples/cookbook/src/lib.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod tests { + use fuels::accounts::wallet::WalletUnlocked; use fuels::{ prelude::Result, types::transaction_builders::{ScriptTransactionBuilder, TransactionBuilder}, diff --git a/examples/predicates/src/lib.rs b/examples/predicates/src/lib.rs index 083ee76aba..3d686eaf20 100644 --- a/examples/predicates/src/lib.rs +++ b/examples/predicates/src/lib.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod tests { + use fuels::accounts::wallet::WalletUnlocked; use fuels::{ accounts::{predicate::Predicate, Account}, prelude::*, diff --git a/examples/providers/src/lib.rs b/examples/providers/src/lib.rs index 09fb56f5b8..f0867d8ee2 100644 --- a/examples/providers/src/lib.rs +++ b/examples/providers/src/lib.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - + use fuels::accounts::wallet::WalletUnlocked; use fuels::prelude::Result; #[tokio::test] diff --git a/examples/wallets/src/lib.rs b/examples/wallets/src/lib.rs index a69cebb505..ec87e54774 100644 --- a/examples/wallets/src/lib.rs +++ b/examples/wallets/src/lib.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod tests { + use fuels::accounts::wallet::WalletUnlocked; use fuels::prelude::*; #[tokio::test] diff --git a/packages/fuels-accounts/src/lib.rs b/packages/fuels-accounts/src/lib.rs index 22323304a7..60d461a6e6 100644 --- a/packages/fuels-accounts/src/lib.rs +++ b/packages/fuels-accounts/src/lib.rs @@ -22,7 +22,6 @@ use fuels_core::{ }, }; use provider::ResourceFilter; -pub use wallet::{Wallet, WalletUnlocked}; use crate::{accounts_utils::extract_message_id, provider::Provider}; diff --git a/packages/fuels-core/src/codec/abi_decoder.rs b/packages/fuels-core/src/codec/abi_decoder.rs index e6f10dca86..df8abe8ba7 100644 --- a/packages/fuels-core/src/codec/abi_decoder.rs +++ b/packages/fuels-core/src/codec/abi_decoder.rs @@ -37,7 +37,7 @@ impl ABIDecoder { /// /// ``` /// use fuels_core::codec::ABIDecoder; - /// use fuels_types::{Token, param_types::ParamType}; + /// use fuels_core::types::{param_types::ParamType, Token}; /// /// let tokens = ABIDecoder::decode(&[ParamType::U8, ParamType::U8], &[0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,2]).unwrap(); /// diff --git a/packages/fuels-programs/src/call_utils.rs b/packages/fuels-programs/src/call_utils.rs index bbb3bafb02..36b4a9a36d 100644 --- a/packages/fuels-programs/src/call_utils.rs +++ b/packages/fuels-programs/src/call_utils.rs @@ -409,7 +409,7 @@ fn extract_unique_contract_ids(calls: &[ContractCall]) -> HashSet { mod test { use std::slice; - use fuels_accounts::WalletUnlocked; + use fuels_accounts::wallet::WalletUnlocked; use fuels_core::{ codec::ABIEncoder, types::{ diff --git a/packages/fuels-test-helpers/src/accounts.rs b/packages/fuels-test-helpers/src/accounts.rs index 2b21bfd7dd..f3858085b5 100644 --- a/packages/fuels-test-helpers/src/accounts.rs +++ b/packages/fuels-test-helpers/src/accounts.rs @@ -3,7 +3,9 @@ use std::{mem::size_of, net::SocketAddr}; #[cfg(feature = "fuel-core-lib")] use fuel_core::service::Config; use fuel_core_chain_config::ChainConfig; -use fuels_accounts::{fuel_crypto::SecretKey, provider::Provider, ViewOnlyAccount, WalletUnlocked}; +use fuels_accounts::{ + fuel_crypto::SecretKey, provider::Provider, wallet::WalletUnlocked, ViewOnlyAccount, +}; use fuels_core::types::{coin::Coin, message::Message}; #[cfg(not(feature = "fuel-core-lib"))] diff --git a/packages/fuels/src/lib.rs b/packages/fuels/src/lib.rs index 657826aefa..62bc76338f 100644 --- a/packages/fuels/src/lib.rs +++ b/packages/fuels/src/lib.rs @@ -73,7 +73,6 @@ pub mod prelude { pub use super::{ accounts::{ provider::*, wallet::generate_mnemonic_phrase, Account, Signer, ViewOnlyAccount, - Wallet, WalletUnlocked, }, fuel_node::*, programs::{ diff --git a/packages/fuels/tests/contracts.rs b/packages/fuels/tests/contracts.rs index 504ac581a2..d4187c4523 100644 --- a/packages/fuels/tests/contracts.rs +++ b/packages/fuels/tests/contracts.rs @@ -4,7 +4,7 @@ use std::future::Future; use std::vec; use fuels::{ - accounts::{predicate::Predicate, Account}, + accounts::{predicate::Predicate, wallet::WalletUnlocked, Account}, core::codec::{calldata, fn_selector}, prelude::*, types::Bits256, diff --git a/packages/fuels/tests/predicates.rs b/packages/fuels/tests/predicates.rs index fd7d6f10ab..67b98c2b71 100644 --- a/packages/fuels/tests/predicates.rs +++ b/packages/fuels/tests/predicates.rs @@ -1,6 +1,6 @@ use fuel_tx::Output; use fuels::{ - accounts::{predicate::Predicate, Account}, + accounts::{predicate::Predicate, wallet::WalletUnlocked, Account}, prelude::*, types::{ coin::Coin, diff --git a/packages/fuels/tests/providers.rs b/packages/fuels/tests/providers.rs index c27252817e..4be3e148f5 100644 --- a/packages/fuels/tests/providers.rs +++ b/packages/fuels/tests/providers.rs @@ -5,7 +5,7 @@ use chrono::{DateTime, Duration, NaiveDateTime, TimeZone, Utc}; use fuel_core::service::{Config as CoreConfig, FuelService, ServiceTrait}; use fuel_core_types::tai64::Tai64; use fuels::{ - accounts::{fuel_crypto::SecretKey, Account}, + accounts::{fuel_crypto::SecretKey, wallet::WalletUnlocked, Account}, client::{PageDirection, PaginationRequest}, prelude::*, test_helpers::Config, diff --git a/packages/fuels/tests/scripts.rs b/packages/fuels/tests/scripts.rs index 2ff46bf4c9..48f44e4371 100644 --- a/packages/fuels/tests/scripts.rs +++ b/packages/fuels/tests/scripts.rs @@ -1,4 +1,5 @@ use fuels::prelude::*; +use fuels_accounts::wallet::WalletUnlocked; #[tokio::test] async fn test_transaction_script_workflow() -> Result<()> { diff --git a/packages/fuels/tests/types_predicates.rs b/packages/fuels/tests/types_predicates.rs index 9984325f1d..d4de4ce5cb 100644 --- a/packages/fuels/tests/types_predicates.rs +++ b/packages/fuels/tests/types_predicates.rs @@ -1,7 +1,7 @@ use std::path::Path; use fuels::{ - accounts::{predicate::Predicate, Account}, + accounts::{predicate::Predicate, wallet::WalletUnlocked, Account}, prelude::*, types::{coin::Coin, message::Message, unresolved_bytes::UnresolvedBytes, AssetId}, }; diff --git a/packages/fuels/tests/wallets.rs b/packages/fuels/tests/wallets.rs index bb1a42defc..ef13bfcbaf 100644 --- a/packages/fuels/tests/wallets.rs +++ b/packages/fuels/tests/wallets.rs @@ -2,7 +2,9 @@ use std::iter::repeat; use fuel_tx::input::coin::CoinSigned; use fuel_tx::{Bytes32, Input, Output, TxPointer, UtxoId}; -use fuels::{prelude::*, types::transaction_builders::ScriptTransactionBuilder}; +use fuels::prelude::*; +use fuels::types::transaction_builders::ScriptTransactionBuilder; +use fuels_accounts::wallet::{Wallet, WalletUnlocked}; use fuels_test_helpers::setup_test_provider; #[tokio::test]