Introduce provider traits for HasRuntime

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

@@ -15,8 +15,8 @@ use cosmos_test_components::bootstrap::types::genesis_config::CosmosGenesisConfi
 use cosmos_test_components::chain::types::denom::Denom;
 use cosmos_test_components::chain::types::wallet::CosmosTestWallet;
 use eyre::Error;
-use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
-use ibc_relayer_runtime::types::error::TokioRuntimeError;
+use ibc_relayer_components::runtime::traits::runtime::{ProvideRuntime, RuntimeTypeComponent};
+use ibc_relayer_runtime::impls::types::runtime::ProvideTokioRuntimeType;
 use ibc_relayer_runtime::types::runtime::TokioRuntimeContext;
 use ibc_relayer_types::core::ics24_host::identifier::ChainId;
 use ibc_test_components::bootstrap::traits::types::chain::ProvideChainType;
@@ -63,6 +63,8 @@ delegate_components!(
         ErrorRaiserComponent,
     ]:
         HandleErrorsWithEyre,
+    RuntimeTypeComponent:
+        ProvideTokioRuntimeType,
     ChainConfigTypeComponent: ProvideCosmosChainConfigType,
     GenesisConfigTypeComponent: ProvideCosmosGenesisConfigType,
     WalletConfigGeneratorComponent: GenerateStandardWalletConfig,
@@ -92,15 +94,9 @@ impl ChainFromBootstrapParamsBuilder<CosmosStdBootstrapContext> for CosmosStdBoo
     }
 }
 
-impl HasRuntime for CosmosStdBootstrapContext {
-    type Runtime = TokioRuntimeContext;
-
-    fn runtime(&self) -> &TokioRuntimeContext {
-        &self.runtime
-    }
-
-    fn runtime_error(e: TokioRuntimeError) -> Error {
-        e.into()
+impl ProvideRuntime<CosmosStdBootstrapContext> for CosmosStdBootstrapComponents {
+    fn runtime(bootstrap: &CosmosStdBootstrapContext) -> &TokioRuntimeContext {
+        &bootstrap.runtime
     }
 }
 

crates/cosmos-test-components/src/bootstrap/components/cosmos_sdk.rs

@@ -3,6 +3,8 @@ use core::marker::PhantomData;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
+use ibc_relayer_components::runtime::traits::runtime::RuntimeComponent;
+use ibc_relayer_components::runtime::traits::runtime::RuntimeTypeComponent;
 use ibc_test_components::bootstrap::traits::chain::ChainBootstrapperComponent;
 use ibc_test_components::bootstrap::traits::types::chain::ChainTypeComponent;
 
@@ -71,6 +73,8 @@ delegate_components!(
     [
         ErrorTypeComponent,
         ErrorRaiserComponent,
+        RuntimeTypeComponent,
+        RuntimeComponent,
         ChainTypeComponent,
         GenesisConfigTypeComponent,
         ChainConfigTypeComponent,

crates/cosmos-test-components/src/bootstrap/components/cosmos_sdk_legacy.rs

@@ -3,6 +3,8 @@ use core::marker::PhantomData;
 use cgp_core::prelude::*;
 use cgp_core::ErrorRaiserComponent;
 use cgp_core::ErrorTypeComponent;
+use ibc_relayer_components::runtime::traits::runtime::RuntimeComponent;
+use ibc_relayer_components::runtime::traits::runtime::RuntimeTypeComponent;
 use ibc_test_components::bootstrap::traits::chain::ChainBootstrapperComponent;
 use ibc_test_components::bootstrap::traits::types::chain::ChainTypeComponent;
 
@@ -50,6 +52,8 @@ delegate_components!(
     [
         ErrorTypeComponent,
         ErrorRaiserComponent,
+        RuntimeTypeComponent,
+        RuntimeComponent,
         ChainIdGeneratorComponent,
         ChainHomeDirInitializerComponent,
         ChainDataInitializerComponent,

crates/cosmos-test-components/src/bootstrap/impls/chain/bootstrap_chain.rs

@@ -36,7 +36,7 @@ where
         + CanInitChainConfig
         + CanStartChainFullNode
         + CanBuildChainFromBootstrapParameters,
-    Runtime: HasFilePathType + HasChildProcessType,
+    Runtime: HasFilePathType + HasChildProcessType + HasErrorType,
     Chain: HasChainIdType + HasWalletType,
 {
     async fn bootstrap_chain(

crates/cosmos-test-components/src/bootstrap/impls/chain/start_chain.rs

@@ -42,7 +42,7 @@ where
             .runtime()
             .start_child_process(chain_command, &args, Some(&stdout_path), Some(&stderr_path))
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(child_process)
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_account.rs

@@ -48,7 +48,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_validator.rs

@@ -51,7 +51,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis/add_genesis_wallet.rs

@@ -25,7 +25,7 @@ where
         + CanInitWallet
         + CanAddGenesisAccount
         + CanAddGenesisValidator,
-    Runtime: HasFilePathType,
+    Runtime: HasFilePathType + HasErrorType,
     Chain: HasChainIdType + HasWalletType + HasAmountType + HasAddressType,
 {
     async fn add_wallet_to_genesis(

crates/cosmos-test-components/src/bootstrap/impls/genesis/collect_gentxs.rs

@@ -30,7 +30,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_account.rs

@@ -48,7 +48,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis_legacy/add_genesis_validator.rs

@@ -3,11 +3,11 @@ use ibc_relayer_components::chain::traits::types::chain_id::HasChainIdType;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 use ibc_test_components::bootstrap::traits::types::chain::HasChainType;
 use ibc_test_components::chain::traits::types::amount::HasAmountType;
+use ibc_test_components::runtime::traits::exec_command::CanExecCommand;
+use ibc_test_components::runtime::traits::types::file_path::HasFilePathType;
 
 use crate::bootstrap::traits::fields::chain_command_path::HasChainCommandPath;
 use crate::bootstrap::traits::genesis::add_genesis_validator::GenesisValidatorAdder;
-use ibc_test_components::runtime::traits::exec_command::CanExecCommand;
-use ibc_test_components::runtime::traits::types::file_path::HasFilePathType;
 
 /**
    Implementation for adding genesis validator to legacy Cosmos chains
@@ -51,7 +51,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/genesis_legacy/collect_gentxs.rs

@@ -29,7 +29,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/initializers/create_chain_home_dir.rs

@@ -20,7 +20,7 @@ impl<Bootstrap, Runtime, Chain> ChainHomeDirInitializer<Bootstrap> for CreateCha
 where
     Bootstrap:
         HasChainType<Chain = Chain> + HasRuntime<Runtime = Runtime> + HasErrorType + HasTestDir,
-    Runtime: HasFilePathType,
+    Runtime: HasFilePathType + HasErrorType,
     Chain: HasChainIdType,
     Chain::ChainId: Display,
     Runtime::FilePath: AsRef<Path>,

crates/cosmos-test-components/src/bootstrap/impls/initializers/init_chain_data.rs

@@ -39,7 +39,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         Ok(())
     }

crates/cosmos-test-components/src/bootstrap/impls/initializers/init_wallet.rs

@@ -50,7 +50,7 @@ where
                 ],
             )
             .await
-            .map_err(Bootstrap::runtime_error)?
+            .map_err(Bootstrap::raise_error)?
             .stderr;
 
         let json_val: json::Value = json::from_str(&seed_content).map_err(Report::from)?;
@@ -72,7 +72,7 @@ where
             .runtime()
             .write_string_to_file(&seed_path, &seed_content)
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         let hd_path = bootstrap.wallet_hd_path();
 

crates/cosmos-test-components/src/bootstrap/impls/initializers/update_chain_config.rs

@@ -35,19 +35,19 @@ where
         let rpc_port = runtime
             .reserve_tcp_port()
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
         let p2p_port = runtime
             .reserve_tcp_port()
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
         let pprof_port = runtime
             .reserve_tcp_port()
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
         let grpc_port = runtime
             .reserve_tcp_port()
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         let comet_config = {
             let mut comet_config = {
@@ -59,7 +59,7 @@ where
                 let comet_config_string = runtime
                     .read_file_as_string(&comet_config_path)
                     .await
-                    .map_err(Bootstrap::runtime_error)?;
+                    .map_err(Bootstrap::raise_error)?;
 
                 toml::from_str(&comet_config_string).map_err(Report::from)?
             };
@@ -88,7 +88,7 @@ where
                 let sdk_config_string = runtime
                     .read_file_as_string(&sdk_config_path)
                     .await
-                    .map_err(Bootstrap::runtime_error)?;
+                    .map_err(Bootstrap::raise_error)?;
 
                 toml::from_str(&sdk_config_string).map_err(Report::from)?
             };

crates/cosmos-test-components/src/bootstrap/impls/initializers/update_genesis_config.rs

@@ -40,7 +40,7 @@ where
         let config_string = runtime
             .read_file_as_string(&genesis_file_path)
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         let mut config_json: Value = serde_json::from_str(&config_string).map_err(Report::from)?;
 
@@ -52,7 +52,7 @@ where
         runtime
             .write_string_to_file(&genesis_file_path, &modified_config_string)
             .await
-            .map_err(Bootstrap::runtime_error)?;
+            .map_err(Bootstrap::raise_error)?;
 
         // TODO: generate random denom
 

crates/relayer-components-extra/src/batch/components/message_sender.rs

@@ -37,12 +37,12 @@ where
         let message_sender = context.get_batch_sender();
 
         Runtime::send(message_sender, (messages, result_sender))
-            .map_err(TargetChain::runtime_error)
+            .map_err(TargetChain::raise_error)
             .map_err(Target::target_chain_error)?;
 
         let events = Runtime::receive_once(result_receiver)
             .await
-            .map_err(TargetChain::runtime_error)
+            .map_err(TargetChain::raise_error)
             .map_err(Target::target_chain_error)??;
 
         Ok(events)

crates/relayer-components-extra/src/batch/traits/channel.rs

@@ -3,6 +3,7 @@ use ibc_relayer_components::chain::traits::types::chain::HasChainTypes;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
 use ibc_relayer_components::relay::traits::target::ChainTarget;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
+use ibc_relayer_components::runtime::types::aliases::Runtime;
 
 use crate::batch::types::aliases::MessageBatchSender;
 use crate::runtime::traits::channel::HasChannelTypes;
@@ -12,7 +13,7 @@ pub trait HasMessageBatchSender<Target>: HasRelayChains
 where
     Target: ChainTarget<Self>,
     Target::TargetChain: HasRuntime,
-    <Target::TargetChain as HasRuntime>::Runtime: HasChannelTypes + HasChannelOnceTypes,
+    Runtime<Target::TargetChain>: HasChannelTypes + HasChannelOnceTypes,
 {
     fn get_batch_sender(&self) -> &MessageBatchSender<Target::TargetChain, Self::Error>;
 }

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

@@ -11,7 +11,7 @@ use ibc_relayer_components::chain::traits::types::chain_id::HasChainId;
 use ibc_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
 use ibc_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget};
-use ibc_relayer_components::runtime::traits::mutex::{HasMutex, HasRuntimeWithMutex};
+use ibc_relayer_components::runtime::traits::mutex::HasMutex;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 
 use crate::batch::traits::config::HasBatchConfig;
@@ -138,12 +138,13 @@ where
 #[async_trait]
 impl<Build, Target, Chain, Counterparty, Runtime> CanBuildBatchChannel<Target> for Build
 where
-    Build: HasBiRelayType + HasRuntimeWithMutex + HasErrorType,
+    Build: HasBiRelayType + HasRuntime + HasErrorType,
     Target: ChainBuildTarget<Build, TargetChain = Chain, CounterpartyChain = Counterparty>,
     Chain: HasIbcChainTypes<Counterparty> + HasRuntime<Runtime = Runtime>,
     Counterparty: HasIbcChainTypes<Chain>,
     Runtime: CanCreateChannels + HasChannelOnceTypes + CanCloneSender,
     Build: HasBatchSenderCache<Target, RelayError<Build>>,
+    Build::Runtime: HasMutex,
     Chain::ChainId: Ord + Clone,
     Counterparty::ChainId: Ord + Clone,
     Chain::ClientId: Ord + Clone,

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

@@ -6,7 +6,8 @@ use ibc_relayer_components::build::traits::target::chain::ChainBuildTarget;
 use ibc_relayer_components::build::types::aliases::{
     CounterpartyChainId, CounterpartyClientId, TargetChain, TargetChainId, TargetClientId,
 };
-use ibc_relayer_components::runtime::traits::mutex::HasRuntimeWithMutex;
+use ibc_relayer_components::runtime::traits::mutex::HasMutex;
+use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 use ibc_relayer_components::runtime::types::aliases::Mutex;
 
 use crate::batch::traits::channel::HasMessageBatchSenderType;
@@ -25,9 +26,10 @@ pub trait HasBatchSenderCacheType<Build, Error>: Async {
 impl<Target, Build, Error> HasBatchSenderCacheType<Build, Error> for Target
 where
     Error: Async,
-    Build: HasBiRelayType + HasRuntimeWithMutex,
+    Build: HasBiRelayType + HasRuntime,
     Target: ChainBuildTarget<Build>,
     Target::TargetChain: HasMessageBatchSenderType<Error>,
+    Build::Runtime: HasMutex,
 {
     type BatchSenderCache = Mutex<
         Build,

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

@@ -4,7 +4,7 @@ use ibc_relayer_components::build::traits::target::relay::RelayBuildTarget;
 use ibc_relayer_components::build::types::aliases::{
     TargetDstChain, TargetDstClientId, TargetRelay, TargetSrcChain, TargetSrcClientId,
 };
-use ibc_relayer_components::runtime::traits::mutex::HasRuntimeWithMutex;
+use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 
 use crate::batch::traits::channel::HasMessageBatchSenderTypes;
 use crate::std_prelude::*;
@@ -61,8 +61,7 @@ where
 }
 
 #[async_trait]
-pub trait CanBuildRelayWithBatch<Target>:
-    HasBiRelayType + HasRuntimeWithMutex + HasErrorType
+pub trait CanBuildRelayWithBatch<Target>: HasBiRelayType + HasRuntime + HasErrorType
 where
     Target: RelayBuildTarget<Self>,
     Target::TargetRelay: HasMessageBatchSenderTypes,
@@ -82,7 +81,7 @@ where
 #[async_trait]
 impl<Build, Target> CanBuildRelayWithBatch<Target> for Build
 where
-    Build: HasBiRelayType + HasRuntimeWithMutex + HasErrorType + HasComponents,
+    Build: HasBiRelayType + HasRuntime + HasErrorType + HasComponents,
     Target: RelayBuildTarget<Build>,
     Target::TargetRelay: HasMessageBatchSenderTypes,
     Build::Components: RelayWithBatchBuilder<Build, Target>,

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

@@ -8,6 +8,8 @@ use ibc_relayer_components::components::default::birelay::DefaultBiRelayComponen
 use ibc_relayer_components::logger::traits::has_logger::{
     LoggerFieldComponent, LoggerTypeComponent,
 };
+use ibc_relayer_components::runtime::traits::runtime::RuntimeComponent;
+use ibc_relayer_components::runtime::traits::runtime::RuntimeTypeComponent;
 
 pub struct ExtraBiRelayComponents<BaseComponents>(pub PhantomData<BaseComponents>);
 
@@ -16,6 +18,8 @@ delegate_components!(
     [
         ErrorTypeComponent,
         ErrorRaiserComponent,
+        RuntimeTypeComponent,
+        RuntimeComponent,
         RunnerComponent,
         LoggerTypeComponent,
         LoggerFieldComponent,