Revert "feat: Disable arc_type requirement in candid for ic-utils (df…

…inity#454)"

This reverts commit 432ff1d.

ic-utils/src/call.rs

@@ -4,16 +4,10 @@ use ic_agent::{agent::UpdateBuilder, export::Principal, Agent, AgentError, Reque
 use serde::de::DeserializeOwned;
 use std::fmt;
 use std::future::Future;
-use std::pin::Pin;
 
 mod expiry;
 pub use expiry::Expiry;
 
-#[cfg(target_family = "wasm")]
-pub(crate) type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + 'a>>;
-#[cfg(not(target_family = "wasm"))]
-pub(crate) type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + 'a + Send>>;
-
 /// A type that implements synchronous calls (ie. 'query' calls).
 #[cfg_attr(target_family = "wasm", async_trait(?Send))]
 #[cfg_attr(not(target_family = "wasm"), async_trait)]
@@ -102,15 +96,14 @@ where
     ///     .create_canister()
     ///     .as_provisional_create_with_amount(None)
     ///     .with_effective_canister_id(effective_id)
-    ///     .and_then(|(canister_id,)| {
-    ///         let call = management_canister
-    ///             .install_code(&canister_id, canister_wasm)
-    ///             .build()
-    ///             .unwrap();
-    ///         async move {
-    ///             call.call_and_wait().await?;
-    ///             Ok((canister_id,))
-    ///         }
+    ///     .and_then(|(canister_id,)| async move {
+    ///       management_canister
+    ///         .install_code(&canister_id, canister_wasm)
+    ///         .build()
+    ///         .unwrap()
+    ///         .call_and_wait()
+    ///         .await?;
+    ///       Ok((canister_id,))
     ///     })
     ///     .call_and_wait()
     ///     .await?;

ic-utils/src/interfaces/management_canister/builders.rs

@@ -1,10 +1,7 @@
 //! Builder interfaces for some method calls of the management canister.
 
 use crate::{
-    call::{AsyncCall, BoxFuture},
-    canister::Argument,
-    interfaces::management_canister::MgmtMethod,
-    Canister,
+    call::AsyncCall, canister::Argument, interfaces::management_canister::MgmtMethod, Canister,
 };
 use async_trait::async_trait;
 use candid::{CandidType, Deserialize, Nat};
@@ -440,20 +437,15 @@ impl<'agent, 'canister: 'agent> InstallCodeBuilder<'agent, 'canister> {
     }
 }
 
+#[cfg_attr(target_family = "wasm", async_trait(?Send))]
+#[cfg_attr(not(target_family = "wasm"), async_trait)]
 impl<'agent, 'canister: 'agent> AsyncCall<()> for InstallCodeBuilder<'agent, 'canister> {
-    fn call<'async_trait>(self) -> BoxFuture<'async_trait, Result<RequestId, AgentError>>
-    where
-        Self: 'async_trait,
-    {
-        let call_res = self.build();
-        Box::pin(async move { call_res?.call().await })
+    async fn call(self) -> Result<RequestId, AgentError> {
+        self.build()?.call().await
     }
-    fn call_and_wait<'async_trait>(self) -> BoxFuture<'async_trait, Result<(), AgentError>>
-    where
-        Self: 'async_trait,
-    {
-        let call_res = self.build();
-        Box::pin(async move { call_res?.call_and_wait().await })
+
+    async fn call_and_wait(self) -> Result<(), AgentError> {
+        self.build()?.call_and_wait().await
     }
 }
 

ic-utils/src/interfaces/wallet.rs

@@ -2,17 +2,18 @@
 //!
 //! [cycles wallet]: https://github.com/dfinity/cycles-wallet
 
-use std::{future::Future, ops::Deref};
+use std::ops::Deref;
 
 use crate::{
-    call::{AsyncCall, BoxFuture, SyncCall},
+    call::{AsyncCall, SyncCall},
     canister::Argument,
     interfaces::management_canister::{
         attributes::{ComputeAllocation, FreezingThreshold, MemoryAllocation},
         builders::CanisterSettings,
     },
     Canister,
 };
+use async_trait::async_trait;
 use candid::{decode_args, utils::ArgumentDecoder, CandidType, Deserialize, Nat};
 use ic_agent::{agent::RejectCode, export::Principal, Agent, AgentError, RequestId};
 use once_cell::sync::Lazy;
@@ -110,34 +111,28 @@ where
     }
 
     /// Calls the forwarded canister call on the wallet canister. Equivalent to `.build().call()`.
-    pub fn call(self) -> impl Future<Output = Result<RequestId, AgentError>> + 'agent {
-        let call_res = self.build();
-        async move { call_res?.call().await }
+    pub async fn call(self) -> Result<RequestId, AgentError> {
+        self.build()?.call().await
     }
 
     /// Calls the forwarded canister call on the wallet canister, and waits for the result. Equivalent to `.build().call_and_wait()`.
-    pub fn call_and_wait(self) -> impl Future<Output = Result<Out, AgentError>> + 'agent {
-        let call_res = self.build();
-        async move { call_res?.call_and_wait().await }
+    pub async fn call_and_wait(self) -> Result<Out, AgentError> {
+        self.build()?.call_and_wait().await
     }
 }
 
+#[cfg_attr(target_family = "wasm", async_trait(?Send))]
+#[cfg_attr(not(target_family = "wasm"), async_trait)]
 impl<'agent, 'canister: 'agent, Out> AsyncCall<Out> for CallForwarder<'agent, 'canister, Out>
 where
     Out: for<'de> ArgumentDecoder<'de> + Send + Sync,
 {
-    fn call<'async_trait>(self) -> BoxFuture<'async_trait, Result<RequestId, AgentError>>
-    where
-        Self: 'async_trait,
-    {
-        Box::pin(self.call())
+    async fn call(self) -> Result<RequestId, AgentError> {
+        self.call().await
     }
 
-    fn call_and_wait<'async_trait>(self) -> BoxFuture<'async_trait, Result<Out, AgentError>>
-    where
-        Self: 'async_trait,
-    {
-        Box::pin(self.call_and_wait())
+    async fn call_and_wait(self) -> Result<Out, AgentError> {
+        self.call_and_wait().await
     }
 }