Remove Async bounds in component traits and macros (#402)

* Remove Async bounds in component traits and macros

* Reformat imports

* Use back main branch

crates/cosmos/cosmos-chain-components/src/impls/client/create_client_message.rs

@@ -1,4 +1,5 @@
 use cgp_core::error::CanRaiseError;
+use cgp_core::Async;
 use hermes_encoding_components::traits::convert::CanConvert;
 use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding;
 use hermes_relayer_components::chain::traits::message_builders::create_client::CreateClientMessageBuilder;
@@ -23,7 +24,8 @@ where
         + CanRaiseError<Encoding::Error>,
     Counterparty: HasCreateClientPayloadType<Chain, CreateClientPayload = CosmosCreateClientPayload>
         + HasDefaultEncoding<Encoding = Encoding>,
-    Encoding: CanConvert<TendermintClientState, Any> + CanConvert<TendermintConsensusState, Any>,
+    Encoding:
+        Async + CanConvert<TendermintClientState, Any> + CanConvert<TendermintConsensusState, Any>,
 {
     async fn build_create_client_message(
         _chain: &Chain,

crates/cosmos/cosmos-integration-tests/src/contexts/chain_driver.rs

@@ -1,6 +1,5 @@
 use alloc::collections::BTreeMap;
 use alloc::sync::Arc;
-use ibc_relayer::config::{ChainConfig, Config};
 use std::path::PathBuf;
 
 use cgp_core::error::{ErrorRaiserComponent, ErrorTypeComponent};
@@ -41,6 +40,7 @@ use hermes_test_components::chain_driver::traits::proposal::vote::ProposalVoterC
 use hermes_test_components::chain_driver::traits::types::chain::{ChainGetter, ProvideChainType};
 use hermes_wasm_test_components::components::WasmChainDriverComponents;
 use hermes_wasm_test_components::traits::chain_driver::upload_client_code::WasmClientCodeUploaderComponent;
+use ibc_relayer::config::{ChainConfig, Config};
 use tokio::process::Child;
 use tokio::sync::Mutex;
 use toml::{to_string_pretty, Value};

crates/cosmos/cosmos-integration-tests/src/impls/bootstrap/build_cosmos_chain_driver.rs

@@ -1,7 +1,6 @@
 use alloc::collections::BTreeMap;
 use alloc::sync::Arc;
 use std::path::PathBuf;
-use tokio::sync::Mutex;
 
 use cgp_core::error::CanRaiseError;
 use hermes_cosmos_relayer::contexts::chain::CosmosChain;
@@ -21,6 +20,7 @@ use hermes_runtime_components::traits::runtime::HasRuntimeType;
 use hermes_test_components::chain_driver::traits::types::chain::HasChainType;
 use hermes_test_components::driver::traits::types::chain_driver::HasChainDriverType;
 use tokio::process::Child;
+use tokio::sync::Mutex;
 
 use crate::contexts::chain_driver::CosmosChainDriver;
 use crate::traits::bootstrap::build_chain::CanBuildChainWithNodeConfig;

crates/cosmos/cosmos-relayer/src/impls/error.rs

@@ -1,12 +1,12 @@
 use alloc::string::FromUtf8Error;
 use core::convert::Infallible;
 use core::num::ParseIntError;
-use hermes_any_counterparty::impls::encoding::consensus_state::UnknownConsensusStateType;
 
 use cgp_core::error::{DelegateErrorRaiser, ErrorRaiser, ErrorRaiserComponent, ErrorTypeComponent};
 use cgp_core::prelude::*;
 use eyre::Report;
 use hermes_any_counterparty::impls::encoding::client_state::UnknownClientStateType;
+use hermes_any_counterparty::impls::encoding::consensus_state::UnknownConsensusStateType;
 use hermes_cosmos_chain_components::impls::queries::abci::AbciQueryError;
 use hermes_cosmos_chain_components::impls::transaction::submit_tx::BroadcastTxError;
 use hermes_error::handlers::debug::DebugError;

crates/relayer/relayer-components-extra/src/components/extra/build.rs

@@ -84,6 +84,6 @@ where
         + RelayWithBatchBuilder<Build, 0, 1>
         + RelayWithBatchBuilder<Build, 1, 0>
         + ProvideErrorType<Build>,
-    BaseComponents: ChainBuilder<Build, 0> + ChainBuilder<Build, 1>,
+    BaseComponents: Async + ChainBuilder<Build, 0> + ChainBuilder<Build, 1>,
 {
 }

crates/relayer/relayer-components/src/build/impls/bootstrap/birelay.rs

@@ -1,4 +1,5 @@
 use cgp_core::prelude::{async_trait, HasErrorType};
+use cgp_core::Async;
 
 use crate::build::impls::bootstrap::relay::CanBootstrapRelay;
 use crate::build::traits::builders::birelay_builder::CanBuildBiRelay;
@@ -41,17 +42,20 @@ pub trait CanBootstrapBiRelay<const A: usize, const B: usize>:
 
 impl<Build, ChainA, ChainB, const A: usize, const B: usize> CanBootstrapBiRelay<A, B> for Build
 where
-    Build: HasBiRelayTypeAt<A, B>
+    Build: Async
+        + HasBiRelayTypeAt<A, B>
         + HasChainTypeAt<A, Chain = ChainA>
         + HasChainTypeAt<B, Chain = ChainB>
         + CanBuildBiRelay<A, B>
         + CanBootstrapRelay<A, B>,
-    ChainA: HasChainIdType
+    ChainA: Async
+        + HasChainIdType
         + HasCreateClientPayloadOptionsType<ChainB>
         + HasCreateClientMessageOptionsType<ChainB>
         + HasIbcChainTypes<ChainB>
         + HasErrorType,
-    ChainB: HasChainIdType
+    ChainB: Async
+        + HasChainIdType
         + HasCreateClientPayloadOptionsType<ChainA>
         + HasCreateClientMessageOptionsType<ChainA>
         + HasIbcChainTypes<ChainA>

crates/relayer/relayer-components/src/chain/impls/queries/query_and_convert_client_state.rs

@@ -1,6 +1,7 @@
 use alloc::vec::Vec;
 
 use cgp_core::error::CanRaiseError;
+use cgp_core::Async;
 use hermes_encoding_components::traits::convert::CanConvert;
 use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding;
 
@@ -17,7 +18,7 @@ impl<Chain, Counterparty, Encoding> ClientStateQuerier<Chain, Counterparty>
 where
     Chain: CanQueryRawClientState<Counterparty> + CanRaiseError<Encoding::Error>,
     Counterparty: HasClientStateType<Chain> + HasDefaultEncoding<Encoding = Encoding>,
-    Encoding: CanConvert<Chain::RawClientState, Counterparty::ClientState>,
+    Encoding: Async + CanConvert<Chain::RawClientState, Counterparty::ClientState>,
 {
     async fn query_client_state(
         chain: &Chain,
@@ -39,7 +40,7 @@ impl<Chain, Counterparty, Encoding> ClientStateWithProofsQuerier<Chain, Counterp
 where
     Chain: CanQueryRawClientStateWithProofs<Counterparty> + CanRaiseError<Encoding::Error>,
     Counterparty: HasClientStateType<Chain> + HasDefaultEncoding<Encoding = Encoding>,
-    Encoding: CanConvert<Chain::RawClientState, Counterparty::ClientState>,
+    Encoding: Async + CanConvert<Chain::RawClientState, Counterparty::ClientState>,
 {
     async fn query_client_state_with_proofs(
         chain: &Chain,
@@ -63,7 +64,7 @@ impl<Chain, Counterparty, Encoding> AllClientStatesQuerier<Chain, Counterparty>
 where
     Chain: CanQueryAllRawClientStates<Counterparty>,
     Counterparty: HasClientStateType<Chain> + HasDefaultEncoding<Encoding = Encoding>,
-    Encoding: CanConvert<Chain::RawClientState, Counterparty::ClientState>,
+    Encoding: Async + CanConvert<Chain::RawClientState, Counterparty::ClientState>,
 {
     async fn query_all_client_states(
         chain: &Chain,

crates/relayer/relayer-components/src/chain/impls/queries/query_and_convert_consensus_state.rs

@@ -1,4 +1,5 @@
 use cgp_core::error::CanRaiseError;
+use cgp_core::Async;
 use hermes_encoding_components::traits::convert::CanConvert;
 use hermes_encoding_components::traits::has_encoding::HasDefaultEncoding;
 
@@ -17,7 +18,7 @@ where
     Chain: CanQueryRawConsensusState<Counterparty> + CanRaiseError<Encoding::Error>,
     Counterparty:
         HasConsensusStateType<Chain> + HasDefaultEncoding<Encoding = Encoding> + HasHeightType,
-    Encoding: CanConvert<Chain::RawConsensusState, Counterparty::ConsensusState>,
+    Encoding: Async + CanConvert<Chain::RawConsensusState, Counterparty::ConsensusState>,
 {
     async fn query_consensus_state(
         chain: &Chain,
@@ -43,7 +44,7 @@ where
     Chain: CanQueryRawConsensusStateWithProofs<Counterparty> + CanRaiseError<Encoding::Error>,
     Counterparty:
         HasConsensusStateType<Chain> + HasDefaultEncoding<Encoding = Encoding> + HasHeightType,
-    Encoding: CanConvert<Chain::RawConsensusState, Counterparty::ConsensusState>,
+    Encoding: Async + CanConvert<Chain::RawConsensusState, Counterparty::ConsensusState>,
 {
     async fn query_consensus_state_with_proofs(
         chain: &Chain,

crates/relayer/relayer-components/src/components/default/build.rs

@@ -29,7 +29,8 @@ pub trait UseDefaultBuildComponents: CanBuildBiRelay<0, 1> {}
 
 impl<Build, Components, BaseComponents> UseDefaultBuildComponents for Build
 where
-    Build: HasBiRelayTypeAt<0, 1>
+    Build: Async
+        + HasBiRelayTypeAt<0, 1>
         + HasRelayCache<0, 1>
         + HasRelayCache<1, 0>
         + HasChainCache<0>
@@ -49,6 +50,6 @@ where
         + RelayFromChainsBuilder<Build, 0, 1>
         + RelayFromChainsBuilder<Build, 1, 0>
         + ProvideErrorType<Build>,
-    BaseComponents: ChainBuilder<Build, 0> + ChainBuilder<Build, 1>,
+    BaseComponents: Async + ChainBuilder<Build, 0> + ChainBuilder<Build, 1>,
 {
 }

crates/relayer/relayer-components/src/multi/traits/birelay_at.rs

@@ -5,7 +5,7 @@ use crate::multi::traits::relay_at::{HasRelayTypeAt, RelayAt};
 
 #[derive_component(BiRelayTypeAtComponent, ProvideBiRelayTypeAt<Setup>)]
 pub trait HasBiRelayTypeAt<const A: usize, const B: usize>:
-    HasRelayTypeAt<A, B> + HasRelayTypeAt<B, A>
+    Async + HasRelayTypeAt<A, B> + HasRelayTypeAt<B, A>
 {
     type BiRelay: HasChainTypeAt<A, Chain = ChainAt<Self, A>>
         + HasChainTypeAt<B, Chain = ChainAt<Self, B>>

crates/relayer/relayer-components/src/multi/traits/relay_at.rs

@@ -7,7 +7,8 @@ use crate::relay::traits::chains::HasRelayChains;
 
 #[derive_component(RelayTypeAtComponent, ProvideRelayTypeAt<Context>)]
 pub trait HasRelayTypeAt<const SRC: usize, const DST: usize>:
-    HasChainTypeAt<SRC, Chain: HasIbcChainTypes<ChainAt<Self, DST>>>
+    Async
+    + HasChainTypeAt<SRC, Chain: HasIbcChainTypes<ChainAt<Self, DST>>>
     + HasChainTypeAt<DST, Chain: HasIbcChainTypes<ChainAt<Self, SRC>>>
 {
     type Relay: HasRelayChains<SrcChain = ChainAt<Self, SRC>, DstChain = ChainAt<Self, DST>>;

crates/relayer/relayer-components/src/relay/impls/fields.rs

@@ -34,7 +34,8 @@ impl<
     > ProvideRelayChains<Relay>
     for ProvideRelayFields<SrcChainField, DstChainField, SrcClientIdField, DstClientIdField>
 where
-    Relay: HasErrorType
+    Relay: Async
+        + HasErrorType
         + HasField<SrcChainField, Field = SrcChain>
         + HasField<DstChainField, Field = DstChain>
         + HasField<SrcClientIdField, Field = SrcChain::ClientId>

crates/relayer/relayer-components/src/relay/traits/chains.rs

@@ -33,7 +33,7 @@ use crate::chain::types::aliases::ClientIdOf;
     only a single channel or connection.
 */
 #[derive_component(RelayChainsComponent, ProvideRelayChains<Relay>)]
-pub trait HasRelayChains: HasErrorType {
+pub trait HasRelayChains: Async + HasErrorType {
     type Packet: Async;
 
     /**

crates/runtime/async-runtime-components/src/channel/traits.rs

@@ -64,7 +64,7 @@ where
 
 impl<Runtime, Components> HasUnboundedChannelType for Runtime
 where
-    Runtime: HasComponents<Components = Components>,
+    Runtime: Async + HasComponents<Components = Components>,
     Components: UnboundedChannelTypeProvider<Runtime> + ProvideChannelType<Runtime>,
 {
     fn from_unbounded_sender<T>(sender: Arc<Mutex<mpsc::UnboundedSender<T>>>) -> Self::Sender<T>

crates/runtime/async-runtime-components/src/stream/traits/boxed.rs

@@ -23,7 +23,7 @@ pub trait HasBoxedStreamType: HasStreamType {
 
 impl<Runtime, Components> HasBoxedStreamType for Runtime
 where
-    Runtime: HasComponents<Components = Components>,
+    Runtime: Async + HasComponents<Components = Components>,
     Components: BoxedStreamTypeProvider<Runtime>,
 {
     fn to_boxed_stream<Item>(

crates/runtime/runtime-components/src/traits/os/reserve_port.rs

@@ -3,6 +3,6 @@ use cgp_core::prelude::*;
 #[derive_component(TcpPortReserverComponent, TcpPortReserver<Runtime>)]
 /// Allocate a TCP port that the full node process use for listening
 #[async_trait]
-pub trait CanReserveTcpPort: HasErrorType {
+pub trait CanReserveTcpPort: Async + HasErrorType {
     async fn reserve_tcp_port(&self) -> Result<u16, Self::Error>;
 }

crates/runtime/tokio-runtime-components/src/components/parallel.rs

@@ -19,9 +19,8 @@ pub use hermes_runtime_components::traits::fs::file_path::FilePathTypeComponent;
 pub use hermes_runtime_components::traits::fs::read_file::FileAsStringReaderComponent;
 pub use hermes_runtime_components::traits::fs::write_file::StringToFileWriterComponent;
 pub use hermes_runtime_components::traits::mutex::MutexComponent;
-pub use hermes_runtime_components::traits::os::child_process::ChildProcessWaiterComponent;
 pub use hermes_runtime_components::traits::os::child_process::{
-    ChildProcessStarterComponent, ChildProcessTypeComponent,
+    ChildProcessStarterComponent, ChildProcessTypeComponent, ChildProcessWaiterComponent,
 };
 pub use hermes_runtime_components::traits::os::exec_command::{
     CommandExecutorComponent, CommandWithEnvsExecutorComponent,

crates/runtime/tokio-runtime-components/src/impls/os/reserve_port.rs

@@ -10,7 +10,7 @@ pub struct TokioReserveTcpPort;
 
 impl<Runtime> TcpPortReserver<Runtime> for TokioReserveTcpPort
 where
-    Runtime: CanRaiseError<IoError>,
+    Runtime: Async + CanRaiseError<IoError>,
 {
     async fn reserve_tcp_port(_runtime: &Runtime) -> Result<u16, Runtime::Error> {
         // TODO: abort if failed to find a free port after X tries

crates/runtime/tokio-runtime-components/src/traits/channel.rs

@@ -57,7 +57,7 @@ where
 
 impl<Runtime, Components> HasUnboundedChannelType for Runtime
 where
-    Runtime: HasComponents<Components = Components>,
+    Runtime: Async + HasComponents<Components = Components>,
     Components: UnboundedChannelTypeProvider<Runtime> + ProvideChannelType<Runtime>,
 {
     fn from_unbounded_sender<T>(sender: mpsc::UnboundedSender<T>) -> Self::Sender<T>

crates/test/test-components/src/chain_driver/traits/config.rs

@@ -1,4 +1,5 @@
 use alloc::string::String;
+
 use cgp_core::prelude::*;
 
 #[derive_component(ConfigUpdaterComponent, ConfigUpdater<ChainDriver>)]