Move CallMethod trait, Clippy

bindings/core/src/method_handler/call_method.rs

@@ -1,11 +1,6 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(not(target_family = "wasm"))]
-use std::pin::Pin;
-
-#[cfg(not(target_family = "wasm"))]
-use futures::Future;
 use iota_sdk::{
     client::{secret::SecretManager, Client},
     wallet::wallet::Wallet,
@@ -22,41 +17,6 @@ use crate::{
     UtilsMethod,
 };
 
-#[cfg(not(target_family = "wasm"))]
-pub trait CallMethod {
-    type Method;
-
-    // This uses a manual async_trait-like impl because it's not worth it to import the lib for one trait
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>>;
-}
-
-#[cfg(not(target_family = "wasm"))]
-impl CallMethod for Client {
-    type Method = ClientMethod;
-
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
-        Box::pin(call_client_method(self, method))
-    }
-}
-
-#[cfg(not(target_family = "wasm"))]
-impl CallMethod for Wallet {
-    type Method = WalletMethod;
-
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
-        Box::pin(call_wallet_method(self, method))
-    }
-}
-
-#[cfg(not(target_family = "wasm"))]
-impl CallMethod for SecretManager {
-    type Method = SecretManagerMethod;
-
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
-        Box::pin(call_secret_manager_method(self, method))
-    }
-}
-
 /// Call a client method.
 pub async fn call_client_method(client: &Client, method: ClientMethod) -> Response {
     log::debug!("Client method: {method:?}");

bindings/core/src/method_handler/call_method_trait.rs

@@ -0,0 +1,46 @@
+// Copyright 2023 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+use std::pin::Pin;
+
+use futures::Future;
+use iota_sdk::{
+    client::{secret::SecretManager, Client},
+    wallet::Wallet,
+};
+
+use crate::{
+    call_client_method, call_secret_manager_method, call_wallet_method, ClientMethod, Response, SecretManagerMethod,
+    WalletMethod,
+};
+
+pub trait CallMethod {
+    type Method;
+
+    // This uses a manual async_trait-like impl because it's not worth it to import the lib for one trait
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>>;
+}
+
+impl CallMethod for Client {
+    type Method = ClientMethod;
+
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+        Box::pin(call_client_method(self, method))
+    }
+}
+
+impl CallMethod for Wallet {
+    type Method = WalletMethod;
+
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+        Box::pin(call_wallet_method(self, method))
+    }
+}
+
+impl CallMethod for SecretManager {
+    type Method = SecretManagerMethod;
+
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+        Box::pin(call_secret_manager_method(self, method))
+    }
+}

bindings/core/src/method_handler/mod.rs

@@ -3,13 +3,15 @@
 
 mod account;
 mod call_method;
+#[cfg(not(target_family = "wasm"))]
+mod call_method_trait;
 mod client;
 mod secret_manager;
 mod utils;
 mod wallet;
 
-#[cfg(not(target_family = "wasm"))]
-pub use call_method::CallMethod;
 pub use call_method::{call_client_method, call_secret_manager_method, call_utils_method, call_wallet_method};
+#[cfg(not(target_family = "wasm"))]
+pub use call_method_trait::CallMethod;
 #[cfg(feature = "mqtt")]
 pub use client::listen_mqtt;

sdk/src/wallet/wallet/builder.rs

@@ -146,7 +146,7 @@ impl WalletBuilder {
         #[cfg(feature = "storage")]
         let read_manager_builder = storage_manager.lock().await.get_wallet_data().await?;
         #[cfg(not(feature = "storage"))]
-        let read_manager_builder: Option<WalletBuilder> = None;
+        let read_manager_builder: Option<Self> = None;
 
         // Prioritize provided client_options and secret_manager over stored ones
         let new_provided_client_options = if self.client_options.is_none() {