Use marker trait pattern to simplify component delegation (#76)

* Use auto trait delegation using marker traits for LegacyCosmosSdkBootstrapComponents

* Use marker traits for auto component delegation

* Use new marker trait syntax in delegate_components! macro

* Use auto component delegation for relay components

* Use auto component delegation for relay components

* Use auto component delegation for builder context

* Slightly reorganize build modules

* Use auto component delegation for birelay components

* Use auto component delegation for tx components

* Use auto component delegation for chain components

* Use struct-like syntax and put components mapping inside curly brace

* Use delegate_all! macro to auto delegate components

* Use new syntax for all calls to delegate_components!

* Fix Cargo.toml patch

* Use back cgp main branch

* Update cgp version

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

@@ -1,8 +1,10 @@
 use cgp_core::prelude::*;
-use cgp_core::{ErrorRaiserComponent, ErrorTypeComponent};
+use cgp_core::{delegate_all, ErrorRaiserComponent, ErrorTypeComponent};
 use cgp_error_eyre::HandleErrorsWithEyre;
-use cosmos_test_components::bootstrap::components::closures::cosmos_sdk_legacy::CanUseLegacyCosmosSdkChainBootstrapper;
 use cosmos_test_components::bootstrap::components::cosmos_sdk_legacy::LegacyCosmosSdkBootstrapComponents;
+use cosmos_test_components::bootstrap::components::cosmos_sdk_legacy::{
+    CanUseLegacyCosmosSdkChainBootstrapper, IsLegacyCosmosSdkBootstrapComponent,
+};
 use cosmos_test_components::bootstrap::impls::fields::denom::DenomForStaking;
 use cosmos_test_components::bootstrap::impls::fields::denom::DenomForTransfer;
 use cosmos_test_components::bootstrap::impls::fields::denom::GenesisDenomGetter;
@@ -53,27 +55,34 @@ impl CanUseLegacyCosmosSdkChainBootstrapper for CosmosStdBootstrapContext {}
 pub struct CosmosStdBootstrapComponents;
 
 impl HasComponents for CosmosStdBootstrapContext {
-    type Components = LegacyCosmosSdkBootstrapComponents<CosmosStdBootstrapComponents>;
+    type Components = CosmosStdBootstrapComponents;
 }
 
-delegate_components!(
-    CosmosStdBootstrapComponents;
-    [
-        ErrorTypeComponent,
-        ErrorRaiserComponent,
-    ]:
-        HandleErrorsWithEyre,
-    RuntimeTypeComponent:
-        ProvideTokioRuntimeType,
-    ChainConfigTypeComponent: ProvideCosmosChainConfigType,
-    GenesisConfigTypeComponent: ProvideCosmosGenesisConfigType,
-    WalletConfigGeneratorComponent: GenerateStandardWalletConfig,
-    [
-        WalletConfigTypeComponent,
-        WalletConfigFieldsComponent,
-    ]: ProvideCosmosWalletConfigType,
+delegate_all!(
+    IsLegacyCosmosSdkBootstrapComponent,
+    LegacyCosmosSdkBootstrapComponents,
+    CosmosStdBootstrapComponents,
 );
 
+delegate_components! {
+    CosmosStdBootstrapComponents {
+        [
+            ErrorTypeComponent,
+            ErrorRaiserComponent,
+        ]:
+            HandleErrorsWithEyre,
+        RuntimeTypeComponent:
+            ProvideTokioRuntimeType,
+        ChainConfigTypeComponent: ProvideCosmosChainConfigType,
+        GenesisConfigTypeComponent: ProvideCosmosGenesisConfigType,
+        WalletConfigGeneratorComponent: GenerateStandardWalletConfig,
+        [
+            WalletConfigTypeComponent,
+            WalletConfigFieldsComponent,
+        ]: ProvideCosmosWalletConfigType,
+    }
+}
+
 impl ProvideChainType<CosmosStdBootstrapContext> for CosmosStdBootstrapComponents {
     type Chain = CosmosTestChain;
 }

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

@@ -22,23 +22,24 @@ impl HasComponents for CosmosTestChain {
     type Components = CosmosTestChainComponents;
 }
 
-delegate_components!(
-    CosmosTestChainComponents;
-    [
-        ChainIdTypeProviderComponent,
-    ]:
-        ProvideCosmosChainTypes,
-    [
-        WalletTypeComponent,
-        WalletSignerComponent,
-    ]:
-        ProvideCosmosTestWallet,
-    ChainIdFromStringBuilderComponent:
-        BuildCosmosChainIdFromString,
-    AmountTypeComponent:
-        ProvideU128AmountWithDenom,
-    DenomTypeComponent:
-        ProvideIbcDenom,
-    AddressTypeComponent:
-        ProvideStringAddress,
-);
+delegate_components! {
+    CosmosTestChainComponents {
+        [
+            ChainIdTypeProviderComponent,
+        ]:
+            ProvideCosmosChainTypes,
+        [
+            WalletTypeComponent,
+            WalletSignerComponent,
+        ]:
+            ProvideCosmosTestWallet,
+        ChainIdFromStringBuilderComponent:
+            BuildCosmosChainIdFromString,
+        AmountTypeComponent:
+            ProvideU128AmountWithDenom,
+        DenomTypeComponent:
+            ProvideIbcDenom,
+        AddressTypeComponent:
+            ProvideStringAddress,
+    }
+}