Use delegate_all! macro to auto delegate components

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

@@ -1,5 +1,5 @@
 use cgp_core::prelude::*;
-use cgp_core::{ErrorRaiserComponent, ErrorTypeComponent};
+use cgp_core::{ErrorRaiserComponent, ErrorTypeComponent, delegate_all};
 use cgp_error_eyre::HandleErrorsWithEyre;
 use cosmos_test_components::bootstrap::components::cosmos_sdk_legacy::LegacyCosmosSdkBootstrapComponents;
 use cosmos_test_components::bootstrap::components::cosmos_sdk_legacy::{
@@ -58,12 +58,11 @@ impl HasComponents for CosmosStdBootstrapContext {
     type Components = CosmosStdBootstrapComponents;
 }
 
-impl<Component> DelegateComponent<Component> for CosmosStdBootstrapComponents
-where
-    CosmosStdBootstrapComponents: IsLegacyCosmosSdkBootstrapComponent<Component>,
-{
-    type Delegate = LegacyCosmosSdkBootstrapComponents;
-}
+delegate_all!(
+    IsLegacyCosmosSdkBootstrapComponent,
+    LegacyCosmosSdkBootstrapComponents,
+    CosmosStdBootstrapComponents,
+);
 
 delegate_components!(
     CosmosStdBootstrapComponents;

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

@@ -45,23 +45,23 @@ delegate_components!(
     }
 );
 
-pub trait CanUseExtraBuildComponents<BaseComponents>:
-    UseExtraBuildComponents<BaseComponents>
+pub trait CanUseExtraBuildComponents:
+    UseExtraBuildComponents
 where
     ChainA<Self>: HasIbcChainTypes<ChainB<Self>>,
     ChainB<Self>: HasIbcChainTypes<ChainA<Self>>,
 {
 }
 
-pub trait UseExtraBuildComponents<BaseComponents>: CanBuildBiRelay
+pub trait UseExtraBuildComponents: CanBuildBiRelay
 where
     ChainA<Self>: HasIbcChainTypes<ChainB<Self>>,
     ChainB<Self>: HasIbcChainTypes<ChainA<Self>>,
 {
 }
 
 impl<Build, BiRelay, RelayAToB, RelayBToA, ChainA, ChainB, Error, Components, BaseComponents>
-    UseExtraBuildComponents<BaseComponents> for Build
+    UseExtraBuildComponents for Build
 where
     Build: HasBatchConfig
         + HasBiRelayType<BiRelay = BiRelay>
@@ -96,7 +96,9 @@ where
     ChainA::Runtime: CanCreateChannels + CanUseChannelsOnce + CanCloneSender,
     ChainB::Runtime: CanCreateChannels + CanUseChannelsOnce + CanCloneSender,
     Build::Runtime: HasMutex,
-    Components: DelegatesToExtraBuildComponents<BaseComponents>
+    Components:
+        HasComponents<Components = BaseComponents>
+        + DelegatesToExtraBuildComponents<BaseComponents>
         + BiRelayFromRelayBuilder<Build>
         + RelayWithBatchBuilder<Build, RelayAToBTarget>
         + RelayWithBatchBuilder<Build, RelayBToATarget>,

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

@@ -35,15 +35,21 @@ delegate_components!(
     }
 );
 
-pub trait UseDefaultBuildComponents<BaseComponents>: CanBuildBiRelay
+pub trait CanUseDefaultBuildComponents: UseDefaultBuildComponents
+where
+    ChainA<Self>: HasIbcChainTypes<ChainB<Self>>,
+    ChainB<Self>: HasIbcChainTypes<ChainA<Self>>,
+{}
+
+pub trait UseDefaultBuildComponents: CanBuildBiRelay
 where
     ChainA<Self>: HasIbcChainTypes<ChainB<Self>>,
     ChainB<Self>: HasIbcChainTypes<ChainA<Self>>,
 {
 }
 
 impl<Build, BiRelay, RelayAToB, RelayBToA, ChainA, ChainB, Components, BaseComponents>
-    UseDefaultBuildComponents<BaseComponents> for Build
+    UseDefaultBuildComponents for Build
 where
     Build: HasBiRelayType<BiRelay = BiRelay>
         + HasRelayCache<RelayAToBTarget>
@@ -62,7 +68,9 @@ where
     ChainA::ClientId: Ord + Clone,
     ChainB::ClientId: Ord + Clone,
     Build::Runtime: HasMutex,
-    Components: DelegatesToDefaultBuildComponents<BaseComponents>
+    Components:
+        HasComponents<Components = BaseComponents>
+        + DelegatesToDefaultBuildComponents<BaseComponents>
         + BiRelayFromRelayBuilder<Build>
         + RelayFromChainsBuilder<Build, RelayAToBTarget>
         + RelayFromChainsBuilder<Build, RelayBToATarget>,

crates/relayer-cosmos-mock/src/components/relay.rs

@@ -9,19 +9,18 @@ use ibc_relayer_components::relay::components::packet_filters::allow_all::AllowA
 
 use ibc_relayer_components::relay::traits::components::packet_filter::PacketFilterComponent;
 
-use cgp_core::{delegate_components, DelegateComponent};
+use cgp_core::{delegate_components, DelegateComponent, delegate_all};
 use ibc_relayer_components::runtime::traits::runtime::RuntimeTypeComponent;
 use ibc_relayer_runtime::impls::logger::components::ProvideTracingLogger;
 use ibc_relayer_runtime::impls::types::runtime::ProvideTokioRuntimeType;
 
 pub struct MockCosmosRelayComponents;
 
-impl<Component> DelegateComponent<Component> for MockCosmosRelayComponents
-where
-    Self: IsDefaultRelayComponent<Component>,
-{
-    type Delegate = DefaultRelayComponents;
-}
+delegate_all!(
+    IsDefaultRelayComponent,
+    DefaultRelayComponents,
+    MockCosmosRelayComponents,
+);
 
 delegate_components!(
     MockCosmosRelayComponents;

crates/relayer-cosmos-mock/src/impls/relay.rs

@@ -2,7 +2,7 @@ use alloc::boxed::Box;
 use alloc::vec::Vec;
 
 use async_trait::async_trait;
-use cgp_core::{DelegateComponent, ErrorRaiser, HasComponents, ProvideErrorType};
+use cgp_core::{ErrorRaiser, HasComponents, ProvideErrorType};
 use ibc::clients::ics07_tendermint::client_type;
 use ibc::clients::ics07_tendermint::header::Header;
 use ibc::core::ics02_client::msgs::update_client::MsgUpdateClient;
@@ -28,14 +28,6 @@ use crate::traits::endpoint::BasecoinEndpoint;
 use crate::types::error::Error;
 use crate::util::dummy::dummy_signer;
 
-impl<Name, SrcChain, DstChain> DelegateComponent<Name> for MockCosmosRelay<SrcChain, DstChain>
-where
-    SrcChain: BasecoinEndpoint,
-    DstChain: BasecoinEndpoint,
-{
-    type Delegate = MockCosmosRelayComponents;
-}
-
 impl<SrcChain, DstChain> HasComponents for MockCosmosRelay<SrcChain, DstChain>
 where
     SrcChain: BasecoinEndpoint,

crates/relayer-cosmos/src/impls/birelay/components.rs

@@ -1,3 +1,4 @@
+use cgp_core::delegate_all;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
@@ -23,12 +24,11 @@ where
     type Components = CosmosBiRelayComponents;
 }
 
-impl<Component> DelegateComponent<Component> for CosmosBiRelayComponents
-where
-    Self: IsDefaultBiRelayComponent<Component>,
-{
-    type Delegate = DefaultBiRelayComponents;
-}
+delegate_all!(
+    IsDefaultBiRelayComponent,
+    DefaultBiRelayComponents,
+    CosmosBiRelayComponents,
+);
 
 delegate_components!(
     CosmosBiRelayComponents;

crates/relayer-cosmos/src/impls/build/chain.rs

@@ -6,12 +6,11 @@ use ibc_relayer_types::core::ics24_host::identifier::ChainId;
 
 use crate::contexts::builder::CosmosBuilder;
 use crate::contexts::chain::CosmosChain;
+use crate::impls::build::components::CosmosBaseBuildComponents;
 use crate::types::error::Error;
 
-pub struct BuildCosmosChain;
-
 #[async_trait]
-impl ChainBuilder<CosmosBuilder, ChainATarget> for BuildCosmosChain {
+impl ChainBuilder<CosmosBuilder, ChainATarget> for CosmosBaseBuildComponents {
     async fn build_chain(
         build: &CosmosBuilder,
         _target: ChainATarget,
@@ -24,7 +23,7 @@ impl ChainBuilder<CosmosBuilder, ChainATarget> for BuildCosmosChain {
 }
 
 #[async_trait]
-impl ChainBuilder<CosmosBuilder, ChainBTarget> for BuildCosmosChain {
+impl ChainBuilder<CosmosBuilder, ChainBTarget> for CosmosBaseBuildComponents {
     async fn build_chain(
         build: &CosmosBuilder,
         _target: ChainBTarget,

crates/relayer-cosmos/src/impls/build/components.rs

@@ -1,3 +1,4 @@
+use cgp_core::delegate_all;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
@@ -12,23 +13,27 @@ use ibc_relayer_runtime::impls::logger::components::ProvideTracingLogger;
 use ibc_relayer_runtime::impls::types::runtime::ProvideTokioRuntimeType;
 
 use crate::contexts::builder::CosmosBuilder;
-use crate::impls::build::chain::BuildCosmosChain;
 use crate::impls::error::HandleCosmosError;
 
 pub struct CosmosBuildComponents;
 
+pub struct CosmosBaseBuildComponents;
+
 impl HasComponents for CosmosBuilder {
     type Components = CosmosBuildComponents;
 }
 
-impl<Component> DelegateComponent<Component> for CosmosBuildComponents
-where
-    Self: IsExtraBuildComponent<Component>,
-{
-    type Delegate = ExtraBuildComponents<BuildCosmosChain>;
+impl HasComponents for CosmosBuildComponents {
+    type Components = CosmosBaseBuildComponents;
 }
 
-impl CanUseExtraBuildComponents<BuildCosmosChain> for CosmosBuilder {}
+delegate_all!(
+    IsExtraBuildComponent,
+    ExtraBuildComponents<CosmosBaseBuildComponents>,
+    CosmosBuildComponents,
+);
+
+impl CanUseExtraBuildComponents for CosmosBuilder {}
 
 delegate_components!(
     CosmosBuildComponents;

crates/relayer-cosmos/src/impls/chain/component.rs

@@ -1,3 +1,4 @@
+use cgp_core::delegate_all;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
@@ -97,12 +98,11 @@ where
     type Components = CosmosChainComponents;
 }
 
-impl<Component> DelegateComponent<Component> for CosmosChainComponents
-where
-    Self: IsExtraChainComponent<Component>,
-{
-    type Delegate = ExtraChainComponents<CosmosBaseChainComponents>;
-}
+delegate_all!(
+    IsExtraChainComponent,
+    ExtraChainComponents<CosmosBaseChainComponents>,
+    CosmosChainComponents,
+);
 
 impl<Chain, Counterparty> CanUseExtraChainComponents<CosmosChain<Counterparty>>
     for CosmosChain<Chain>

crates/relayer-cosmos/src/impls/relay/component.rs

@@ -1,3 +1,4 @@
+use cgp_core::delegate_all;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
@@ -33,12 +34,11 @@ delegate_components!(
         ProvideTracingLogger,
 );
 
-impl<Component> DelegateComponent<Component> for CosmosRelayComponents
-where
-    CosmosRelayComponents: IsExtraRelayComponent<Component>,
-{
-    type Delegate = ExtraRelayComponents;
-}
+delegate_all!(
+    IsExtraRelayComponent,
+    ExtraRelayComponents,
+    CosmosRelayComponents,
+);
 
 impl<SrcChain, DstChain> HasComponents for CosmosRelay<SrcChain, DstChain>
 where

crates/relayer-cosmos/src/impls/transaction/component.rs

@@ -1,5 +1,5 @@
 use cgp_core::{
-    delegate_components, DelegateComponent, ErrorRaiserComponent, ErrorTypeComponent, HasComponents,
+    delegate_components, DelegateComponent, ErrorRaiserComponent, ErrorTypeComponent, HasComponents, delegate_all,
 };
 use cosmos_client_components::components::types::chain::ProvideCosmosChainTypes;
 use ibc_relayer_components::chain::traits::types::chain_id::ChainIdTypeProviderComponent;
@@ -24,12 +24,11 @@ impl HasComponents for CosmosTxContext {
     type Components = CosmosTxComponents;
 }
 
-impl<Component> DelegateComponent<Component> for CosmosTxComponents
-where
-    Self: IsDefaultTxComponents<Component>,
-{
-    type Delegate = DefaultTxComponents;
-}
+delegate_all!(
+    IsDefaultTxComponents,
+    DefaultTxComponents,
+    CosmosTxComponents,
+);
 
 impl CanUseDefaultTxComponents for CosmosTxContext {}
 

crates/relayer-solomachine/src/impls/relay/component.rs

@@ -1,3 +1,4 @@
+use cgp_core::delegate_all;
 use cgp_core::prelude::*;
 use ibc_relayer_components::components::default::relay::{
     DefaultRelayComponents, IsDefaultRelayComponent,
@@ -9,12 +10,11 @@ use crate::context::relay::SolomachineRelay;
 
 pub struct SolomachineRelayComponents;
 
-impl<Component> DelegateComponent<Component> for SolomachineRelayComponents
-where
-    Self: IsDefaultRelayComponent<Component>,
-{
-    type Delegate = DefaultRelayComponents;
-}
+delegate_all!(
+    IsDefaultRelayComponent,
+    DefaultRelayComponents,
+    SolomachineRelayComponents,
+);
 
 impl<Chain> HasComponents for SolomachineRelay<Chain>
 where