From 492e47e97493e530c594c27512149964190f1fb0 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Wed, 31 May 2023 14:15:42 +0200 Subject: [PATCH 1/6] Refactor path for WalletUnlocked in fuels::accounts --- 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-programs/src/call_utils.rs | 2 +- packages/fuels-test-helpers/src/accounts.rs | 3 ++- packages/fuels/src/lib.rs | 1 - packages/fuels/tests/contracts.rs | 1 + packages/fuels/tests/predicates.rs | 1 + packages/fuels/tests/providers.rs | 1 + packages/fuels/tests/scripts.rs | 1 + packages/fuels/tests/types_predicates.rs | 1 + packages/fuels/tests/wallets.rs | 1 + 15 files changed, 14 insertions(+), 5 deletions(-) diff --git a/examples/contracts/src/lib.rs b/examples/contracts/src/lib.rs index d3446d9f4..68f293921 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 accb4608b..18eeae890 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 083ee76ab..3d686eaf2 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 09fb56f5b..f0867d8ee 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 a69cebb50..ec87e5477 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 51ebea87f..482b83535 100644 --- a/packages/fuels-accounts/src/lib.rs +++ b/packages/fuels-accounts/src/lib.rs @@ -20,7 +20,6 @@ use fuels_types::{ transaction_response::TransactionResponse, }; use provider::ResourceFilter; -pub use wallet::{Wallet, WalletUnlocked}; use crate::{accounts_utils::extract_message_id, provider::Provider}; diff --git a/packages/fuels-programs/src/call_utils.rs b/packages/fuels-programs/src/call_utils.rs index ec0637fdd..eaf014b15 100644 --- a/packages/fuels-programs/src/call_utils.rs +++ b/packages/fuels-programs/src/call_utils.rs @@ -407,7 +407,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::abi_encoder::ABIEncoder; use fuels_types::coin::CoinStatus; use fuels_types::{ diff --git a/packages/fuels-test-helpers/src/accounts.rs b/packages/fuels-test-helpers/src/accounts.rs index 484a71f83..c774b2cbb 100644 --- a/packages/fuels-test-helpers/src/accounts.rs +++ b/packages/fuels-test-helpers/src/accounts.rs @@ -3,7 +3,8 @@ 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::wallet::WalletUnlocked; +use fuels_accounts::{fuel_crypto::SecretKey, provider::Provider, ViewOnlyAccount}; use fuels_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 aae53c05d..16afbc532 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 d26c135ab..d3026f466 100644 --- a/packages/fuels/tests/contracts.rs +++ b/packages/fuels/tests/contracts.rs @@ -4,6 +4,7 @@ use std::future::Future; use std::vec; use fuels::prelude::*; +use fuels_accounts::wallet::WalletUnlocked; use fuels_accounts::{predicate::Predicate, Account}; use fuels_core::{calldata, fn_selector}; use fuels_types::Bits256; diff --git a/packages/fuels/tests/predicates.rs b/packages/fuels/tests/predicates.rs index 25e46edb7..e7acdfb5b 100644 --- a/packages/fuels/tests/predicates.rs +++ b/packages/fuels/tests/predicates.rs @@ -3,6 +3,7 @@ use fuels::{ prelude::*, types::{coin::Coin, message::Message, AssetId}, }; +use fuels_accounts::wallet::WalletUnlocked; use fuels_accounts::{predicate::Predicate, Account}; use fuels_types::transaction_builders::{ScriptTransactionBuilder, TransactionBuilder}; diff --git a/packages/fuels/tests/providers.rs b/packages/fuels/tests/providers.rs index a2668f795..02200f208 100644 --- a/packages/fuels/tests/providers.rs +++ b/packages/fuels/tests/providers.rs @@ -10,6 +10,7 @@ use fuels::{ tx::Receipt, types::{block::Block, errors::error, message::Message}, }; +use fuels_accounts::wallet::WalletUnlocked; use fuels_accounts::Account; use fuels_types::coin_type::CoinType; diff --git a/packages/fuels/tests/scripts.rs b/packages/fuels/tests/scripts.rs index 743b576d2..c6fa8b82c 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 6a6881afc..e4031d3f6 100644 --- a/packages/fuels/tests/types_predicates.rs +++ b/packages/fuels/tests/types_predicates.rs @@ -4,6 +4,7 @@ use fuels::{ prelude::*, types::{coin::Coin, message::Message, AssetId}, }; +use fuels_accounts::wallet::WalletUnlocked; use fuels_accounts::{predicate::Predicate, Account}; use fuels_types::unresolved_bytes::UnresolvedBytes; diff --git a/packages/fuels/tests/wallets.rs b/packages/fuels/tests/wallets.rs index 02444fead..0ef170876 100644 --- a/packages/fuels/tests/wallets.rs +++ b/packages/fuels/tests/wallets.rs @@ -3,6 +3,7 @@ use std::iter::repeat; use fuel_tx::input::coin::CoinSigned; use fuel_tx::{Bytes32, Input, Output, TxPointer, UtxoId}; use fuels::prelude::*; +use fuels_accounts::wallet::{Wallet, WalletUnlocked}; use fuels_test_helpers::setup_test_provider; use fuels_types::transaction_builders::ScriptTransactionBuilder; From 58387b255ccbb033a5a76ecf7a13270d9a3d96f2 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Wed, 31 May 2023 14:22:11 +0200 Subject: [PATCH 2/6] remove FORC_PATCH_BRANCH --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 757f0c45c..e5542f01c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: FUEL_CORE_VERSION: 0.18.1 RUST_VERSION: 1.68.0 FORC_VERSION: 0.39.0 - FORC_PATCH_BRANCH: "feature/fuel-core-0.18" + FORC_PATCH_BRANCH: "" FORC_PATCH_REVISION: "" jobs: From d7958d336de8b900cc3707c5b2590c135aeb8237 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Wed, 31 May 2023 14:25:47 +0200 Subject: [PATCH 3/6] update forc in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5542f01c..104f39a13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ env: RUSTFLAGS: "-D warnings" FUEL_CORE_VERSION: 0.18.1 RUST_VERSION: 1.68.0 - FORC_VERSION: 0.39.0 + FORC_VERSION: 0.40.0 FORC_PATCH_BRANCH: "" FORC_PATCH_REVISION: "" From e5e12f33d5239c01f78b7b0c1086c93ce5d76a88 Mon Sep 17 00:00:00 2001 From: Emir Date: Wed, 31 May 2023 16:06:28 +0200 Subject: [PATCH 4/6] Update packages/fuels-test-helpers/src/accounts.rs Co-authored-by: iqdecay --- packages/fuels-test-helpers/src/accounts.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/fuels-test-helpers/src/accounts.rs b/packages/fuels-test-helpers/src/accounts.rs index c774b2cbb..92404d984 100644 --- a/packages/fuels-test-helpers/src/accounts.rs +++ b/packages/fuels-test-helpers/src/accounts.rs @@ -3,8 +3,7 @@ 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::wallet::WalletUnlocked; -use fuels_accounts::{fuel_crypto::SecretKey, provider::Provider, ViewOnlyAccount}; +use fuels_accounts::{fuel_crypto::SecretKey, provider::Provider, ViewOnlyAccount, wallet::WalletUnlocked}; use fuels_types::{coin::Coin, message::Message}; #[cfg(not(feature = "fuel-core-lib"))] From a0b349aeb4aa1243a08dd982fdefdc4ce15be366 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Wed, 31 May 2023 16:14:11 +0200 Subject: [PATCH 5/6] fmt --- packages/fuels-test-helpers/src/accounts.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/fuels-test-helpers/src/accounts.rs b/packages/fuels-test-helpers/src/accounts.rs index 92404d984..2152518ff 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, wallet::WalletUnlocked}; +use fuels_accounts::{ + fuel_crypto::SecretKey, provider::Provider, wallet::WalletUnlocked, ViewOnlyAccount, +}; use fuels_types::{coin::Coin, message::Message}; #[cfg(not(feature = "fuel-core-lib"))] From fa8b8e52f81e80a41b5dc11e5ac1a8483538d130 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Wed, 31 May 2023 16:35:20 +0200 Subject: [PATCH 6/6] fix tests --- packages/fuels-core/src/codec/abi_decoder.rs | 2 +- packages/fuels/tests/contracts.rs | 2 +- packages/fuels/tests/predicates.rs | 5 +---- packages/fuels/tests/providers.rs | 5 +---- packages/fuels/tests/types_predicates.rs | 5 +---- packages/fuels/tests/wallets.rs | 2 +- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/fuels-core/src/codec/abi_decoder.rs b/packages/fuels-core/src/codec/abi_decoder.rs index e6f10dca8..df8abe8ba 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/tests/contracts.rs b/packages/fuels/tests/contracts.rs index 504ac581a..d4187c452 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 4cea2ba84..67b98c2b7 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, @@ -9,9 +9,6 @@ use fuels::{ AssetId, }, }; -use fuels_accounts::wallet::WalletUnlocked; -use fuels_accounts::{predicate::Predicate, Account}; -use fuels_types::transaction_builders::{ScriptTransactionBuilder, TransactionBuilder}; async fn assert_address_balance( address: &Bech32Address, diff --git a/packages/fuels/tests/providers.rs b/packages/fuels/tests/providers.rs index 28df7d268..d9274c17e 100644 --- a/packages/fuels/tests/providers.rs +++ b/packages/fuels/tests/providers.rs @@ -4,15 +4,12 @@ use std::{iter, str::FromStr, vec}; use chrono::{TimeZone, Utc}; use fuel_core::service::{Config as CoreConfig, FuelService, ServiceTrait}; use fuels::{ - accounts::{fuel_crypto::SecretKey, Account}, + accounts::{fuel_crypto::SecretKey, wallet::WalletUnlocked, Account}, client::{PageDirection, PaginationRequest}, prelude::*, tx::Receipt, types::{block::Block, coin_type::CoinType, errors::error, message::Message}, }; -use fuels_accounts::wallet::WalletUnlocked; -use fuels_accounts::Account; -use fuels_types::coin_type::CoinType; #[tokio::test] async fn test_provider_launch_and_connect() -> Result<()> { diff --git a/packages/fuels/tests/types_predicates.rs b/packages/fuels/tests/types_predicates.rs index adc3b798e..d4de4ce5c 100644 --- a/packages/fuels/tests/types_predicates.rs +++ b/packages/fuels/tests/types_predicates.rs @@ -1,13 +1,10 @@ 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}, }; -use fuels_accounts::wallet::WalletUnlocked; -use fuels_accounts::{predicate::Predicate, Account}; -use fuels_types::unresolved_bytes::UnresolvedBytes; async fn assert_predicate_spendable( data: UnresolvedBytes, diff --git a/packages/fuels/tests/wallets.rs b/packages/fuels/tests/wallets.rs index 47a0ea7aa..ef13bfcba 100644 --- a/packages/fuels/tests/wallets.rs +++ b/packages/fuels/tests/wallets.rs @@ -3,8 +3,8 @@ use std::iter::repeat; use fuel_tx::input::coin::CoinSigned; use fuel_tx::{Bytes32, Input, Output, TxPointer, UtxoId}; use fuels::prelude::*; +use fuels::types::transaction_builders::ScriptTransactionBuilder; use fuels_accounts::wallet::{Wallet, WalletUnlocked}; -use fuels::{prelude::*, types::transaction_builders::ScriptTransactionBuilder}; use fuels_test_helpers::setup_test_provider; #[tokio::test]