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 <victor@berasconsulting.com>
FuelLabs · Jun 1, 2023 · 2493c30 · 2493c30
1 parent 8408ecd
commit 2493c30
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -409,7 +409,7 @@ fn extract_unique_contract_ids(calls: &[ContractCall]) -> HashSet<ContractId> {
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]