Concurrency and various improvements (#58)

* Improve handling of finished parallel tasks in JoinSet

* Update cgp crates

* Use the runner component from cgp-runner

* Remove the sync version of ibc-relayer-components

* Use main ibc-proto crate

* Remove direct path dependency from Cargo.toml

* Fix test

Cargo.toml

@@ -4,9 +4,7 @@ resolver = "2"
 
 members = [
     "crates/relayer-components",
-    "crates/relayer-components-sync",
     "crates/relayer-components-extra",
-    "crates/relayer-components-extra-sync",
     "crates/relayer-subscription",
     "crates/relayer-all-in-one",
     "crates/relayer-mock",
@@ -28,21 +26,18 @@ overflow-checks = true
 
 [patch.crates-io]
 ibc-relayer-components          = { path = "./crates/relayer-components" }
-ibc-relayer-components-sync     = { path = "./crates/relayer-components-sync" }
 ibc-relayer-components-extra    = { path = "./crates/relayer-components-extra" }
 ibc-relayer-runtime             = { path = "./crates/relayer-runtime" }
+ibc-relayer-all-in-one          = { path = "./crates/relayer-all-in-one" }
+ibc-relayer-subscription        = { path = "./crates/relayer-subscription" }
+ibc-relayer-cosmos              = { path = "./crates/relayer-cosmos" }
 
 cgp-core            = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-cgp-core-sync       = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
 cgp-component       = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-cgp-component-sync  = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
 cgp-component-macro = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
 cgp-error           = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-cgp-error-sync      = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
 cgp-async           = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-cgp-sync            = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-cgp-strip-async     = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
-ibc-proto           = { git = "https://github.com/cosmos/ibc-proto-rs.git",    branch = "luca_joss/solomachine-lightclient-v3-from-v0.32" }
+cgp-run             = { git = "https://github.com/informalsystems/cgp.git", branch = "main" }
 ibc-relayer-types   = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }
 ibc-relayer         = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }
 ibc-telemetry       = { git = "https://github.com/informalsystems/hermes.git", branch = "master" }

crates/relayer-all-in-one/Cargo.toml

@@ -21,5 +21,5 @@ all-features = true
 cgp-core = { version = "0.1.0" }
 futures-core = { version = "0.3", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
-ibc-relayer-components = { version = "0.1.0", path = "../relayer-components" }
-ibc-relayer-components-extra = { version = "0.1.0", path = "../relayer-components-extra" }
+ibc-relayer-components = { version = "0.1.0" }
+ibc-relayer-components-extra = { version = "0.1.0" }

crates/relayer-all-in-one/src/all_for_one/birelay.rs

@@ -1,4 +1,4 @@
-use ibc_relayer_components::core::traits::run::CanRun;
+use cgp_core::CanRun;
 use ibc_relayer_components::logger::traits::level::HasLoggerWithBaseLevels;
 use ibc_relayer_components::relay::traits::two_way::HasTwoWayRelay;
 

crates/relayer-all-in-one/src/all_for_one/relay.rs

@@ -1,5 +1,5 @@
+use cgp_core::CanRun;
 use ibc_relayer_components::chain::types::aliases::{IncomingPacket, OutgoingPacket};
-use ibc_relayer_components::core::traits::run::CanRun;
 use ibc_relayer_components::logger::traits::level::HasLoggerWithBaseLevels;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
 use ibc_relayer_components::relay::traits::channel::open_handshake::CanRelayChannelOpenHandshake;

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

@@ -1,8 +1,8 @@
 use core::marker::PhantomData;
 
 use cgp_core::delegate_component;
+use cgp_core::RunnerComponent;
 use ibc_relayer_components::components::default::birelay::DefaultBiRelayComponents;
-use ibc_relayer_components::core::traits::run::RunnerComponent;
 
 pub struct ExtraBiRelayComponents<BaseComponents>(pub PhantomData<BaseComponents>);
 

crates/relayer-components-extra/src/components/extra/closures/relay/auto_relayer.rs

@@ -1,8 +1,7 @@
-use cgp_core::{Async, HasComponents};
+use cgp_core::{Async, CanRun, HasComponents};
 use ibc_relayer_components::chain::traits::event_subscription::HasEventSubscription;
 use ibc_relayer_components::chain::traits::logs::event::CanLogChainEvent;
 use ibc_relayer_components::chain::traits::types::chain_id::HasChainId;
-use ibc_relayer_components::core::traits::run::CanRun;
 use ibc_relayer_components::logger::traits::has_logger::{HasLogger, HasLoggerType};
 use ibc_relayer_components::logger::traits::level::HasBaseLogLevels;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;

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

@@ -1,8 +1,7 @@
 use core::marker::PhantomData;
 
-use cgp_core::{delegate_component, delegate_components};
+use cgp_core::{delegate_component, delegate_components, RunnerComponent};
 use ibc_relayer_components::components::default::relay::DefaultRelayComponents;
-use ibc_relayer_components::core::traits::run::RunnerComponent;
 use ibc_relayer_components::relay::components::message_senders::chain_sender::SendIbcMessagesToChain;
 use ibc_relayer_components::relay::components::message_senders::update_client::SendIbcMessagesWithUpdateClient;
 use ibc_relayer_components::relay::components::packet_relayers::general::filter_relayer::FilterRelayer;

crates/relayer-components/src/build/traits/components/birelay_builder.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::build::traits::birelay::HasBiRelayType;
 use crate::build::types::aliases::{ChainIdA, ChainIdB, ClientIdA, ClientIdB};

crates/relayer-components/src/build/traits/components/birelay_from_relay_builder.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::build::traits::birelay::HasBiRelayType;
 use crate::build::types::aliases::{RelayAToB, RelayBToA};

crates/relayer-components/src/build/traits/components/chain_builder.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::build::traits::birelay::HasBiRelayType;
 use crate::build::traits::target::chain::ChainBuildTarget;

crates/relayer-components/src/build/traits/components/relay_builder.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::build::traits::birelay::HasBiRelayType;
 use crate::build::traits::target::relay::RelayBuildTarget;

crates/relayer-components/src/build/traits/components/relay_from_chains_builder.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::build::traits::birelay::HasBiRelayType;
 use crate::build::traits::target::relay::RelayBuildTarget;

crates/relayer-components/src/chain/traits/components/chain_status_querier.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::chain::traits::types::height::HasHeightType;
 use crate::chain::traits::types::status::HasChainStatusType;

crates/relayer-components/src/chain/traits/components/consensus_state_querier.rs

@@ -1,4 +1,5 @@
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::chain::traits::types::consensus_state::HasConsensusStateType;
 use crate::chain::traits::types::height::HasHeightType;

crates/relayer-components/src/chain/traits/components/message_sender.rs

@@ -2,7 +2,8 @@
    Trait definitions for [`CanSendMessages`] and [`MessageSender`].
 */
 
-use cgp_core::{async_trait, derive_component, HasErrorType};
+use cgp_core::prelude::*;
+use cgp_core::HasErrorType;
 
 use crate::chain::traits::types::event::HasEventType;
 use crate::chain::traits::types::message::HasMessageType;

crates/relayer-components/src/chain/traits/components/packet_fields_reader.rs

@@ -1,4 +1,4 @@
-use cgp_core::derive_component;
+use cgp_core::prelude::*;
 
 use crate::chain::traits::types::ibc::HasIbcChainTypes;
 use crate::chain::traits::types::packet::HasIbcPacketTypes;