fix wasm build for trezor init

dimxy · Nov 27, 2023 · f569e73 · f569e73
1 parent 1785065
commit f569e73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/mm2src/coins/z_coin.rs b/mm2src/coins/z_coin.rs
@@ -1,6 +1,7 @@
 use crate::coin_errors::MyAddressError;
 #[cfg(not(target_arch = "wasm32"))]
 use crate::my_tx_history_v2::{MyTxHistoryErrorV2, MyTxHistoryRequestV2, MyTxHistoryResponseV2};
+#[cfg(not(target_arch = "wasm32"))]
 use crate::rpc_command::init_withdraw::WithdrawTaskHandleShared;
 #[cfg(not(target_arch = "wasm32"))]
 use crate::rpc_command::init_withdraw::{InitWithdrawCoin, WithdrawInProgressStatus};

diff --git a/mm2src/crypto/src/hw_client.rs b/mm2src/crypto/src/hw_client.rs
@@ -92,9 +92,9 @@ impl HwClient {
     }
 
     #[cfg(target_arch = "wasm32")]
-    pub(crate) async fn trezor<Processor: TrezorConnectProcessor>(
-        processor: &Processor,
-    ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>> {
+    pub(crate) async fn trezor(
+        processor: Arc<dyn TrezorConnectProcessor<Error = RpcTaskError>>,
+    ) -> MmResult<TrezorClient, HwProcessingError<RpcTaskError>> {
         let timeout = processor.on_connect().await?;
 
         let fut = async move {
@@ -184,9 +184,9 @@ impl HwClient {
     }
 
     #[cfg(target_os = "ios")]
-    pub(crate) async fn trezor<Processor: TrezorConnectProcessor>(
-        _processor: &Processor,
-    ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>> {
+    pub(crate) async fn trezor(
+        _processor: Arc<dyn TrezorConnectProcessor<Error = RpcTaskError>>,
+    ) -> MmResult<TrezorClient, HwProcessingError<RpcTaskError>> {
         MmError::err(HwProcessingError::HwError(HwError::Internal(
             "Not supported on iOS!".into(),
         )))

diff --git a/mm2src/mm2_main/src/lp_init/init_metamask.rs b/mm2src/mm2_main/src/lp_init/init_metamask.rs
@@ -13,6 +13,7 @@ use rpc_task::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTask
                            RpcTaskStatusRequest};
 use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
 use std::time::Duration;
+use std::sync::Arc;
 
 pub type InitMetamaskManagerShared = RpcTaskManagerShared<InitMetamaskTask>;
 pub type InitMetamaskStatus =
@@ -120,7 +121,7 @@ impl RpcTask for InitMetamaskTask {
         }
     }
 
-    async fn run(&mut self, task_handle: InitMetamaskTaskHandleShared) -> Result<Self::Item, MmError<Self::Error>> {
+    async fn run(&mut self, _task_handle: InitMetamaskTaskHandleShared) -> Result<Self::Item, MmError<Self::Error>> {
         let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
 
         let metamask = crypto_ctx.init_metamask_ctx(self.req.project.clone()).await?;