cleanup

iotaledger · Feb 9, 2024 · b79e361 · b79e361
1 parent 44c3c4d
commit b79e361
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 99 deletions.
diff --git a/sdk/examples/client/node_api_core/05_post_block_raw.rs b/sdk/examples/client/node_api_core/05_post_block_raw.rs
@@ -12,7 +12,7 @@ use crypto::keys::bip44::Bip44;
 use iota_sdk::{
     client::{
         constants::IOTA_COIN_TYPE,
-        secret::{mnemonic::MnemonicSecretManager, BlockSignExt, SecretManager},
+        secret::{mnemonic::MnemonicSecretManager, BlockSignExt},
         Client, Result,
     },
     types::block::output::AccountId,

diff --git a/sdk/examples/how_tos/account/implicit_account_creation.rs b/sdk/examples/how_tos/account/implicit_account_creation.rs
@@ -11,10 +11,10 @@
 use iota_sdk::{
     client::{
         constants::SHIMMER_COIN_TYPE,
-        secret::{mnemonic::MnemonicSecretManager, PublicKeyOptions, SecretManager},
+        secret::{mnemonic::MnemonicSecretManager, PublicKeyOptions},
     },
     crypto::keys::bip44::Bip44,
-    wallet::{ClientOptions, Result, Wallet, WalletBuilder},
+    wallet::{ClientOptions, Result, WalletBuilder},
 };
 
 #[tokio::main]

diff --git a/sdk/examples/how_tos/account_wallet/transaction.rs b/sdk/examples/how_tos/account_wallet/transaction.rs
@@ -7,10 +7,7 @@
 //! `cargo run --release --all-features --example account_wallet_transaction`
 
 use iota_sdk::{
-    client::{
-        node_api::indexer::query_parameters::BasicOutputQueryParameters,
-        secret::{stronghold::StrongholdSecretManager, SecretManager},
-    },
+    client::{node_api::indexer::query_parameters::BasicOutputQueryParameters, secret::SecretManager},
     types::block::address::{AccountAddress, ToBech32Ext},
     wallet::{AccountSyncOptions, Result, SyncOptions, TransactionOptions},
     Wallet,

diff --git a/sdk/examples/how_tos/accounts_and_addresses/create_wallet.rs b/sdk/examples/how_tos/accounts_and_addresses/create_wallet.rs
@@ -13,10 +13,10 @@
 use iota_sdk::{
     client::{
         constants::SHIMMER_COIN_TYPE,
-        secret::{stronghold::StrongholdSecretManager, PublicKeyOptions, SecretManager},
+        secret::{stronghold::StrongholdSecretManager, PublicKeyOptions},
     },
     crypto::keys::{bip39::Mnemonic, bip44::Bip44},
-    wallet::{ClientOptions, Result, Wallet, WalletBuilder},
+    wallet::{ClientOptions, Result, WalletBuilder},
 };
 
 #[tokio::main]

diff --git a/sdk/examples/how_tos/nft_collection/00_mint_issuer_nft.rs b/sdk/examples/how_tos/nft_collection/00_mint_issuer_nft.rs
@@ -15,7 +15,7 @@
 //! ```
 
 use iota_sdk::{
-    client::secret::{stronghold::StrongholdSecretManager, SecretManager},
+    client::secret::SecretManager,
     types::block::{
         output::{feature::MetadataFeature, NftId, Output, OutputId},
         payload::signed_transaction::TransactionId,

diff --git a/sdk/examples/how_tos/sign_and_verify_ed25519/sign_ed25519.rs b/sdk/examples/how_tos/sign_and_verify_ed25519/sign_ed25519.rs
@@ -13,7 +13,7 @@ use iota_sdk::{
     client::{
         constants::SHIMMER_COIN_TYPE,
         hex_public_key_to_bech32_address,
-        secret::{stronghold::StrongholdSecretManager, SecretManage, SecretManageExt, SecretManager},
+        secret::{stronghold::StrongholdSecretManager, SecretManageExt},
     },
     crypto::keys::bip39::Mnemonic,
     types::block::signature::Ed25519Signature,

diff --git a/sdk/src/wallet/core/mod.rs b/sdk/src/wallet/core/mod.rs
@@ -600,12 +600,10 @@ impl<S: SecretManage> OptionalSecretManager<S> for Wallet<SecretData<S>> {
 mod test {
     use core::str::FromStr;
 
-    use crypto::keys::bip44::Bip44;
     use pretty_assertions::assert_eq;
 
     use super::*;
     use crate::{
-        client::secret::{mnemonic::MnemonicSecretManager, PublicKeyOptions},
         types::block::{
             address::{Address, Ed25519Address},
             input::{Input, UtxoInput},

diff --git a/sdk/src/wallet/core/operations/background_syncing.rs b/sdk/src/wallet/core/operations/background_syncing.rs
@@ -5,10 +5,7 @@ use std::time::Duration;
 
 use tokio::time::timeout;
 
-use crate::{
-    client::secret::SecretManage,
-    wallet::{operations::syncing::SyncOptions, task, Wallet},
-};
+use crate::wallet::{operations::syncing::SyncOptions, task, Wallet};
 
 /// The default interval for background syncing
 pub(crate) const DEFAULT_BACKGROUNDSYNCING_INTERVAL: Duration = Duration::from_secs(7);

diff --git a/sdk/src/wallet/operations/balance.rs b/sdk/src/wallet/operations/balance.rs
@@ -4,7 +4,6 @@
 use primitive_types::U256;
 
 use crate::{
-    client::secret::SecretManage,
     types::block::output::{
         unlock_condition::UnlockCondition, DecayedMana, FoundryId, MinimumOutputAmount, NativeTokensBuilder, Output,
     },

diff --git a/sdk/src/wallet/operations/output_claiming.rs b/sdk/src/wallet/operations/output_claiming.rs
@@ -6,10 +6,7 @@ use std::collections::HashSet;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    client::{
-        api::PreparedTransactionData,
-        secret::{SecretManage, Sign},
-    },
+    client::{api::PreparedTransactionData, secret::SecretManage},
     types::block::{
         address::{Address, Ed25519Address},
         output::{
@@ -188,7 +185,7 @@ impl<T> Wallet<T> {
     }
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Try to claim basic or nft outputs that have additional unlock conditions to their [AddressUnlockCondition]
     /// from [`Wallet::claimable_outputs()`].
     pub async fn claim_outputs<I: IntoIterator<Item = OutputId> + Send>(

diff --git a/sdk/src/wallet/operations/participation/mod.rs b/sdk/src/wallet/operations/participation/mod.rs
@@ -17,7 +17,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    client::{node_manager::node::Node, secret::SecretManage},
+    client::node_manager::node::Node,
     types::{
         api::plugins::participation::{
             responses::TrackedParticipation,

diff --git a/sdk/src/wallet/operations/syncing/addresses/output_ids/account_foundry.rs b/sdk/src/wallet/operations/syncing/addresses/output_ids/account_foundry.rs
@@ -4,10 +4,7 @@
 use std::collections::HashSet;
 
 use crate::{
-    client::{
-        node_api::indexer::query_parameters::{AccountOutputQueryParameters, FoundryOutputQueryParameters},
-        secret::SecretManage,
-    },
+    client::node_api::indexer::query_parameters::{AccountOutputQueryParameters, FoundryOutputQueryParameters},
     types::{
         api::plugins::indexer::OutputIdsResponse,
         block::{

diff --git a/sdk/src/wallet/operations/syncing/addresses/output_ids/basic.rs b/sdk/src/wallet/operations/syncing/addresses/output_ids/basic.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    client::{node_api::indexer::query_parameters::BasicOutputQueryParameters, secret::SecretManage},
+    client::node_api::indexer::query_parameters::BasicOutputQueryParameters,
     types::block::{address::Bech32Address, output::OutputId},
     utils::ConvertTo,
     wallet::Wallet,

diff --git a/sdk/src/wallet/operations/syncing/addresses/output_ids/nft.rs b/sdk/src/wallet/operations/syncing/addresses/output_ids/nft.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    client::{node_api::indexer::query_parameters::NftOutputQueryParameters, secret::SecretManage},
+    client::node_api::indexer::query_parameters::NftOutputQueryParameters,
     types::block::{address::Bech32Address, output::OutputId},
     utils::ConvertTo,
     wallet::Wallet,

diff --git a/sdk/src/wallet/operations/syncing/foundries.rs b/sdk/src/wallet/operations/syncing/foundries.rs
@@ -4,7 +4,6 @@
 use std::collections::HashSet;
 
 use crate::{
-    client::secret::SecretManage,
     types::block::output::{FoundryId, Output},
     wallet::{task, Wallet},
 };

diff --git a/sdk/src/wallet/operations/syncing/mod.rs b/sdk/src/wallet/operations/syncing/mod.rs
@@ -11,7 +11,6 @@ use std::collections::{HashMap, HashSet};
 
 pub use self::options::SyncOptions;
 use crate::{
-    client::secret::SecretManage,
     types::block::{
         address::{AccountAddress, Address, Bech32Address, NftAddress},
         output::{FoundryId, Output, OutputId, OutputMetadata},

diff --git a/sdk/src/wallet/operations/syncing/outputs.rs b/sdk/src/wallet/operations/syncing/outputs.rs
@@ -4,7 +4,7 @@
 use instant::Instant;
 
 use crate::{
-    client::{secret::SecretManage, Client, Error as ClientError},
+    client::{Client, Error as ClientError},
     types::{
         api::core::OutputWithMetadataResponse,
         block::{

diff --git a/sdk/src/wallet/operations/syncing/transactions.rs b/sdk/src/wallet/operations/syncing/transactions.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    client::{secret::SecretManage, unix_timestamp_now},
+    client::unix_timestamp_now,
     types::{
         api::core::TransactionState,
         block::{input::Input, output::OutputId, BlockId},

diff --git a/sdk/src/wallet/operations/transaction/account.rs b/sdk/src/wallet/operations/transaction/account.rs
@@ -22,7 +22,7 @@ use crate::{
     },
 };
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Transitions an implicit account to an account.
     pub async fn implicit_account_transition(
         &self,

diff --git a/sdk/src/wallet/operations/transaction/build_transaction.rs b/sdk/src/wallet/operations/transaction/build_transaction.rs
@@ -6,10 +6,7 @@ use std::collections::HashSet;
 use instant::Instant;
 
 use crate::{
-    client::{
-        api::{input_selection::Selected, transaction::validate_transaction_length, PreparedTransactionData},
-        secret::SecretManage,
-    },
+    client::api::{input_selection::Selected, transaction::validate_transaction_length, PreparedTransactionData},
     types::block::{
         context_input::{BlockIssuanceCreditContextInput, CommitmentContextInput, ContextInput, RewardContextInput},
         input::{Input, UtxoInput},

diff --git a/sdk/src/wallet/operations/transaction/high_level/allot_mana.rs b/sdk/src/wallet/operations/transaction/high_level/allot_mana.rs
@@ -11,7 +11,7 @@ use crate::{
     },
 };
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     pub async fn allot_mana(
         &self,
         allotments: impl IntoIterator<Item = impl Into<ManaAllotment>> + Send,

diff --git a/sdk/src/wallet/operations/transaction/high_level/burning_melting/melt_native_token.rs b/sdk/src/wallet/operations/transaction/high_level/burning_melting/melt_native_token.rs
@@ -17,7 +17,7 @@ use crate::{
     },
 };
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Melts native tokens.
     ///
     /// This happens with the foundry output which minted them, by increasing it's

diff --git a/sdk/src/wallet/operations/transaction/high_level/burning_melting/mod.rs b/sdk/src/wallet/operations/transaction/high_level/burning_melting/mod.rs
@@ -11,7 +11,7 @@ use crate::{
 
 pub(crate) mod melt_native_token;
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// A generic function that can be used to burn native tokens, nfts, delegations, foundries and accounts.
     ///
     /// Note that burning **native tokens** doesn't require the foundry output which minted them, but will not increase

diff --git a/sdk/src/wallet/operations/transaction/high_level/create_account.rs b/sdk/src/wallet/operations/transaction/high_level/create_account.rs
@@ -32,7 +32,7 @@ pub struct CreateAccountParams {
     pub metadata: Option<MetadataFeature>,
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Creates an account output.
     /// ```ignore
     /// let params = CreateAccountParams {

diff --git a/sdk/src/wallet/operations/transaction/high_level/minting/create_native_token.rs b/sdk/src/wallet/operations/transaction/high_level/minting/create_native_token.rs
@@ -47,7 +47,7 @@ pub struct PreparedCreateNativeTokenTransaction {
     pub transaction: PreparedTransactionData,
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Creates a new foundry output with minted native tokens.
     ///
     /// Calls [Wallet::send_outputs()] internally, the options may define the remainder value strategy or custom inputs.

diff --git a/sdk/src/wallet/operations/transaction/high_level/minting/mint_native_token.rs b/sdk/src/wallet/operations/transaction/high_level/minting/mint_native_token.rs
@@ -13,7 +13,7 @@ use crate::{
     },
 };
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Mints additional native tokens.
     ///
     /// The max supply must not be reached yet. The foundry needs to be

diff --git a/sdk/src/wallet/operations/transaction/high_level/minting/mint_nfts.rs b/sdk/src/wallet/operations/transaction/high_level/minting/mint_nfts.rs
@@ -108,7 +108,7 @@ impl MintNftParams {
     }
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Mints NFTs.
     ///
     /// Calls [Wallet::send_outputs()] internally. The options may define the remainder value strategy or custom inputs.

diff --git a/sdk/src/wallet/operations/transaction/high_level/send.rs b/sdk/src/wallet/operations/transaction/high_level/send.rs
@@ -74,7 +74,7 @@ impl SendParams {
     }
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Sends a certain amount of base coins to a single address.
     ///
     /// Calls [Wallet::send_with_params()] internally.

diff --git a/sdk/src/wallet/operations/transaction/high_level/send_native_tokens.rs b/sdk/src/wallet/operations/transaction/high_level/send_native_tokens.rs
@@ -74,7 +74,7 @@ impl SendNativeTokenParams {
     }
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Sends native tokens in basic outputs with a
     /// [`StorageDepositReturnUnlockCondition`](crate::types::block::output::unlock_condition::StorageDepositReturnUnlockCondition)
     /// and an [`ExpirationUnlockCondition`], so that the storage deposit is returned to the sender and the sender

diff --git a/sdk/src/wallet/operations/transaction/high_level/send_nft.rs b/sdk/src/wallet/operations/transaction/high_level/send_nft.rs
@@ -43,7 +43,7 @@ impl SendNftParams {
     }
 }
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Sends native tokens in basic outputs with a
     /// [`StorageDepositReturnUnlockCondition`](crate::types::block::output::unlock_condition::StorageDepositReturnUnlockCondition) and an
     /// [`ExpirationUnlockCondition`](crate::types::block::output::unlock_condition::ExpirationUnlockCondition), so that

diff --git a/sdk/src/wallet/operations/transaction/input_selection.rs b/sdk/src/wallet/operations/transaction/input_selection.rs
@@ -8,7 +8,7 @@ use crate::wallet::events::types::{TransactionProgressEvent, WalletEvent};
 use crate::{
     client::{
         api::input_selection::{Burn, InputSelection, Selected},
-        secret::{types::InputSigningData, SecretManage},
+        secret::types::InputSigningData,
     },
     types::block::{
         address::Address,

diff --git a/sdk/src/wallet/operations/transaction/mod.rs b/sdk/src/wallet/operations/transaction/mod.rs
@@ -32,7 +32,7 @@ use crate::{
     },
 };
 
-impl<S: SecretManage> Wallet<SecretData<S>> {
+impl<S: SecretManage + 'static> Wallet<SecretData<S>> {
     /// Sends a transaction by specifying its outputs.
     ///
     /// Note that, if sending a block fails, the method will return `None` for the block id, but the wallet

diff --git a/sdk/src/wallet/operations/transaction/prepare_output.rs b/sdk/src/wallet/operations/transaction/prepare_output.rs
@@ -4,7 +4,6 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    client::secret::SecretManage,
     types::block::{
         address::{Address, Bech32Address, Ed25519Address},
         output::{

diff --git a/sdk/src/wallet/operations/transaction/prepare_transaction.rs b/sdk/src/wallet/operations/transaction/prepare_transaction.rs
@@ -7,7 +7,7 @@ use instant::Instant;
 use packable::bounded::TryIntoBoundedU16Error;
 
 use crate::{
-    client::{api::PreparedTransactionData, secret::SecretManage},
+    client::api::PreparedTransactionData,
     types::block::{input::INPUT_COUNT_RANGE, output::Output},
     wallet::{
         operations::transaction::{RemainderValueStrategy, TransactionOptions},