Rename default/extra-RelayComponents to -RelayPreset

informalsystems · Dec 11, 2024 · f57a8fe · f57a8fe
1 parent 0bf3dac
commit f57a8fe
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 38 deletions.
diff --git a/crates/cosmos/cosmos-relayer/src/contexts/relay.rs b/crates/cosmos/cosmos-relayer/src/contexts/relay.rs
@@ -36,7 +36,7 @@ use hermes_relayer_components_extra::batch::traits::types::{
 };
 use hermes_relayer_components_extra::components::extra::closures::relay::auto_relayer::CanUseExtraAutoRelayer;
 use hermes_relayer_components_extra::components::extra::relay::{
-    ExtraRelayComponents, IsExtraRelayComponents,
+    ExtraRelayPreset, IsExtraRelayPreset,
 };
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
@@ -153,9 +153,9 @@ delegate_components! {
 
 impl<Name> DelegateComponent<Name> for CosmosRelayComponents
 where
-    Self: IsExtraRelayComponents<Name>,
+    Self: IsExtraRelayPreset<Name>,
 {
-    type Delegate = ExtraRelayComponents;
+    type Delegate = ExtraRelayPreset;
 }
 
 impl HasComponents for CosmosRelay {

diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/cosmos_to_wasm_cosmos_relay.rs
@@ -36,7 +36,7 @@ use hermes_relayer_components::relay::impls::packet_relayers::general::lock::Log
 use hermes_relayer_components::relay::traits::packet_filter::RelayPacketFilterComponent;
 use hermes_relayer_components::relay::traits::packet_lock::PacketLockComponent;
 use hermes_relayer_components::relay::traits::packet_relayer::CanRelayPacket;
-use hermes_relayer_components::with_default_relay_components;
+use hermes_relayer_components::with_default_relay_preset;
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
 use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId, Sequence};
@@ -116,11 +116,11 @@ delegate_components! {
     }
 }
 
-with_default_relay_components! {
+with_default_relay_preset! {
     | Components | {
         delegate_components! {
             CosmosToWasmCosmosRelayComponents {
-                Components: DefaultRelayComponents,
+                Components: DefaultRelayPreset,
             }
         }
     }

diff --git a/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs b/crates/cosmos/cosmos-wasm-relayer/src/context/wasm_cosmos_relay.rs
@@ -35,7 +35,7 @@ use hermes_relayer_components::relay::impls::packet_relayers::general::lock::Log
 use hermes_relayer_components::relay::traits::packet_filter::RelayPacketFilterComponent;
 use hermes_relayer_components::relay::traits::packet_lock::PacketLockComponent;
 use hermes_relayer_components::relay::traits::packet_relayer::CanRelayPacket;
-use hermes_relayer_components::with_default_relay_components;
+use hermes_relayer_components::with_default_relay_preset;
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
 use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId, Sequence};
@@ -115,11 +115,11 @@ delegate_components! {
     }
 }
 
-with_default_relay_components! {
+with_default_relay_preset! {
     | Components | {
         delegate_components! {
             WasmCosmosRelayComponents {
-                Components : DefaultRelayComponents,
+                Components : DefaultRelayPreset,
             }
         }
     }

diff --git a/...elayer/relayer-components-extra/src/components/extra/closures/relay/ack_packet_relayer.rs b/...elayer/relayer-components-extra/src/components/extra/closures/relay/ack_packet_relayer.rs
@@ -35,7 +35,7 @@ use hermes_runtime_components::traits::channel_once::{CanCreateChannelsOnce, Can
 use hermes_runtime_components::traits::runtime::HasRuntime;
 use hermes_runtime_components::traits::sleep::CanSleep;
 
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait CanUseExtraAckPacketRelayer: UseExtraAckPacketRelayer
 where
@@ -90,7 +90,7 @@ where
     DstChain::Runtime: CanSleep,
     Logger: for<'a> CanLog<LogSkipBuildUpdateClientMessage<'a, Relay, SourceTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, SourceTarget>>,
-    Components: DelegatesToExtraRelayComponents
+    Components: DelegatesToExtraRelayPreset
         + ErrorRaiser<Relay, EmptyMessageResponse>
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,

diff --git a/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/auto_relayer.rs b/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/auto_relayer.rs
@@ -20,7 +20,7 @@ use hermes_runtime_components::traits::task::CanRunConcurrentTasks;
 
 use crate::batch::traits::types::CanUseMessageBatchChannel;
 use crate::components::extra::closures::relay::event_relayer::UseExtraEventRelayer;
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait CanUseExtraAutoRelayer: UseExtraAutoRelayer {}
 
@@ -55,7 +55,7 @@ where
     Relay::Runtime: CanSpawnTask + CanRunConcurrentTasks,
     SrcChain::Runtime: HasSubscription + CanRunConcurrentTasks + CanMapStream,
     DstChain::Runtime: HasSubscription + CanRunConcurrentTasks + CanMapStream,
-    Components: DelegatesToExtraRelayComponents
+    Components: DelegatesToExtraRelayPreset
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,
 {

diff --git a/...relayer/relayer-components-extra/src/components/extra/closures/relay/channel_handshake.rs b/...relayer/relayer-components-extra/src/components/extra/closures/relay/channel_handshake.rs
@@ -16,7 +16,7 @@ use hermes_relayer_components::relay::traits::target::{
 
 use crate::components::extra::closures::chain::channel_handshake::UseExtraChainComponentsForChannelHandshake;
 use crate::components::extra::closures::relay::message_sender::UseExtraIbcMessageSender;
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait UseExtraChannelHandshakeRelayer: CanInitChannel + CanRelayChannelOpenHandshake
 where
@@ -35,7 +35,7 @@ where
         + for<'a> CanRaiseError<MissingChannelInitEventError<'a, Relay>>
         + for<'a> CanRaiseError<MissingChannelTryEventError<'a, Relay>>
         + UseExtraIbcMessageSender,
-    Components: DelegatesToExtraRelayComponents
+    Components: DelegatesToExtraRelayPreset
         + ChannelOpenTryRelayer<Relay>
         + ChannelOpenAckRelayer<Relay>
         + ChannelOpenConfirmRelayer<Relay>

diff --git a/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/components.rs b/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/components.rs
@@ -2,7 +2,7 @@ use crate::components::extra::closures::relay::auto_relayer::UseExtraAutoRelayer
 use crate::components::extra::closures::relay::event_relayer::UseExtraEventRelayer;
 use crate::components::extra::closures::relay::packet_relayer::UseExtraPacketRelayer;
 
-pub trait CanUseExtraRelayComponents:
+pub trait CanUseExtraRelayPreset:
     UseExtraPacketRelayer + UseExtraEventRelayer + UseExtraAutoRelayer
 {
 }
diff --git a/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/event_relayer.rs b/crates/relayer/relayer-components-extra/src/components/extra/closures/relay/event_relayer.rs
@@ -15,7 +15,7 @@ use hermes_relayer_components::relay::traits::target::{DestinationTarget, Source
 use crate::components::extra::closures::chain::event_relayer::UseExtraChainComponentsForEventRelayer;
 use crate::components::extra::closures::relay::ack_packet_relayer::UseExtraAckPacketRelayer;
 use crate::components::extra::closures::relay::packet_relayer::UseExtraPacketRelayer;
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait CanUseExtraEventRelayer: UseExtraEventRelayer {}
 
@@ -36,7 +36,7 @@ where
     SrcChain:
         CanReadOutgoingPacketFields<DstChain> + UseExtraChainComponentsForEventRelayer<DstChain>,
     DstChain: UseExtraChainComponentsForEventRelayer<SrcChain>,
-    Components: DelegatesToExtraRelayComponents
+    Components: DelegatesToExtraRelayPreset
         + RelayPacketFilter<Relay>
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,

diff --git a/...es/relayer/relayer-components-extra/src/components/extra/closures/relay/message_sender.rs b/...es/relayer/relayer-components-extra/src/components/extra/closures/relay/message_sender.rs
@@ -26,7 +26,7 @@ use hermes_runtime_components::traits::sleep::CanSleep;
 use crate::batch::traits::channel::HasMessageBatchSender;
 use crate::batch::types::sink::BatchWorkerSink;
 use crate::components::extra::closures::chain::message_sender::UseExtraChainComponentsForIbcMessageSender;
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait UseExtraIbcMessageSender:
     HasRelayClientIds
@@ -72,7 +72,7 @@ where
         + for<'a> CanLog<LogSkipBuildUpdateClientMessage<'a, Relay, DestinationTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, SourceTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, DestinationTarget>>,
-    Components: DelegatesToExtraRelayComponents
+    Components: DelegatesToExtraRelayPreset
         + RelayPacketFilter<Relay>
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,

diff --git a/...es/relayer/relayer-components-extra/src/components/extra/closures/relay/packet_relayer.rs b/...es/relayer/relayer-components-extra/src/components/extra/closures/relay/packet_relayer.rs
@@ -20,7 +20,7 @@ use hermes_relayer_components::relay::traits::target::{
 
 use crate::components::extra::closures::chain::packet_relayer::UseExtraChainComponentsForPacketRelayer;
 use crate::components::extra::closures::relay::message_sender::UseExtraIbcMessageSender;
-use crate::components::extra::relay::DelegatesToExtraRelayComponents;
+use crate::components::extra::relay::DelegatesToExtraRelayPreset;
 
 pub trait CanUseExtraPacketRelayer: UseExtraPacketRelayer {}
 
@@ -47,6 +47,6 @@ where
     Logger: for<'a> CanLog<LogSkipRelayLockedPacket<'a, Relay>>
         + for<'a> CanLog<LogRelayPacketAction<'a, Relay>>
         + for<'a> CanLog<LogRelayPacketStatus<'a, Relay>>,
-    Components: DelegatesToExtraRelayComponents + RelayPacketFilter<Relay>,
+    Components: DelegatesToExtraRelayPreset + RelayPacketFilter<Relay>,
 {
 }
diff --git a/crates/relayer/relayer-components-extra/src/components/extra/relay.rs b/crates/relayer/relayer-components-extra/src/components/extra/relay.rs
@@ -12,21 +12,21 @@ use crate::batch::impls::message_sender::SendMessagesToBatchWorker;
 pub use crate::batch::types::sink::BatchWorkerSink;
 use crate::relay::components::packet_relayers::retry::RetryRelayer;
 
-with_default_relay_components! {
+with_default_relay_preset! {
     [
         IbcMessageSenderComponent<MainSink>,
         PacketRelayerComponent,
     ],
     | Components | {
         cgp_preset! {
-            ExtraRelayComponents {
+            ExtraRelayPreset {
                 IbcMessageSenderComponent<MainSink>: SendMessagesToBatchWorker,
                 IbcMessageSenderComponent<BatchWorkerSink>:
                     SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>,
                 PacketRelayerComponent:
                     LockPacketRelayer<LoggerRelayer<FilterRelayer<RetryRelayer<FullCycleRelayer>>>>,
                 Components:
-                    DefaultRelayComponents,
+                    DefaultRelayPreset,
             }
         }
     }

diff --git a/...es/relayer/relayer-components/src/components/default/closures/relay/ack_packet_relayer.rs b/...es/relayer/relayer-components/src/components/default/closures/relay/ack_packet_relayer.rs
@@ -25,7 +25,7 @@ use crate::chain::traits::types::client_state::HasClientStateFields;
 use crate::chain::traits::types::consensus_state::HasConsensusStateType;
 use crate::chain::traits::types::ibc::HasCounterpartyMessageHeight;
 use crate::chain::traits::types::ibc_events::write_ack::HasWriteAckEvent;
-use crate::components::default::relay::{DelegatesToDefaultRelayComponents, MainSink};
+use crate::components::default::relay::{DelegatesToDefaultRelayPreset, MainSink};
 use crate::relay::impls::update_client::skip::LogSkipBuildUpdateClientMessage;
 use crate::relay::impls::update_client::wait::LogWaitUpdateClientHeightStatus;
 use crate::relay::traits::chains::{HasRelayChains, HasRelayClientIds};
@@ -81,7 +81,7 @@ where
     DstChain::Runtime: CanSleep,
     Logger: for<'a> CanLog<LogSkipBuildUpdateClientMessage<'a, Relay, SourceTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, SourceTarget>>,
-    Components: DelegatesToDefaultRelayComponents
+    Components: DelegatesToDefaultRelayPreset
         + ErrorRaiser<Relay, EmptyMessageResponse>
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,

diff --git a/crates/relayer/relayer-components/src/components/default/closures/relay/auto_relayer.rs b/crates/relayer/relayer-components/src/components/default/closures/relay/auto_relayer.rs
@@ -8,7 +8,7 @@ use hermes_runtime_components::traits::task::CanRunConcurrentTasks;
 
 use crate::chain::traits::event_subscription::HasEventSubscription;
 use crate::components::default::closures::relay::event_relayer::UseDefaultEventRelayer;
-use crate::components::default::relay::DelegatesToDefaultRelayComponents;
+use crate::components::default::relay::DelegatesToDefaultRelayPreset;
 use crate::relay::traits::chains::{HasRelayChains, HasRelayClientIds};
 use crate::relay::traits::target::{
     DestinationTarget, HasDestinationTargetChainTypes, HasSourceTargetChainTypes, HasTargetChains,
@@ -36,7 +36,7 @@ where
     Relay::Runtime: CanRunConcurrentTasks,
     SrcChain::Runtime: HasSubscription + CanRunConcurrentTasks + CanMapStream,
     DstChain::Runtime: HasSubscription + CanRunConcurrentTasks + CanMapStream,
-    Components: DelegatesToDefaultRelayComponents
+    Components: DelegatesToDefaultRelayPreset
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,
 {

diff --git a/crates/relayer/relayer-components/src/components/default/closures/relay/components.rs b/crates/relayer/relayer-components/src/components/default/closures/relay/components.rs
@@ -2,7 +2,7 @@ use crate::components::default::closures::relay::auto_relayer::UseDefaultAutoRel
 use crate::components::default::closures::relay::event_relayer::UseDefaultEventRelayer;
 use crate::components::default::closures::relay::packet_relayer::UseDefaultPacketRelayer;
 
-pub trait CanUseDefaultRelayComponents:
+pub trait CanUseDefaultRelayPreset:
     UseDefaultPacketRelayer + UseDefaultEventRelayer + UseDefaultAutoRelayer
 {
 }
diff --git a/crates/relayer/relayer-components/src/components/default/closures/relay/event_relayer.rs b/crates/relayer/relayer-components/src/components/default/closures/relay/event_relayer.rs
@@ -10,7 +10,7 @@ use crate::chain::traits::types::chain_id::HasChainId;
 use crate::chain::traits::types::ibc_events::send_packet::HasSendPacketEvent;
 use crate::components::default::closures::relay::ack_packet_relayer::UseDefaultAckPacketRelayer;
 use crate::components::default::closures::relay::packet_relayer::UseDefaultPacketRelayer;
-use crate::components::default::relay::DelegatesToDefaultRelayComponents;
+use crate::components::default::relay::DelegatesToDefaultRelayPreset;
 use crate::relay::impls::packet_relayers::general::lock::LogSkipRelayLockedPacket;
 use crate::relay::traits::chains::{CanRaiseRelayChainErrors, HasRelayChains, HasRelayClientIds};
 use crate::relay::traits::event_relayer::CanRelayEvent;
@@ -41,7 +41,7 @@ where
     DstChain: HasChainId
         + CanQueryCounterpartyChainId<Relay::SrcChain>
         + CanBuildPacketFromWriteAck<Relay::SrcChain>,
-    Components: DelegatesToDefaultRelayComponents
+    Components: DelegatesToDefaultRelayPreset
         + RelayPacketFilter<Relay>
         + ErrorRaiser<Relay, SrcChain::Error>
         + ErrorRaiser<Relay, DstChain::Error>,

diff --git a/crates/relayer/relayer-components/src/components/default/closures/relay/packet_relayer.rs b/crates/relayer/relayer-components/src/components/default/closures/relay/packet_relayer.rs
@@ -28,7 +28,7 @@ use crate::chain::traits::types::client_state::HasClientStateFields;
 use crate::chain::traits::types::consensus_state::HasConsensusStateType;
 use crate::chain::traits::types::ibc::HasCounterpartyMessageHeight;
 use crate::chain::traits::types::ibc_events::write_ack::HasWriteAckEvent;
-use crate::components::default::relay::{DelegatesToDefaultRelayComponents, MainSink};
+use crate::components::default::relay::{DelegatesToDefaultRelayPreset, MainSink};
 use crate::relay::impls::packet_relayers::general::full_relay::LogRelayPacketAction;
 use crate::relay::impls::packet_relayers::general::lock::LogSkipRelayLockedPacket;
 use crate::relay::impls::packet_relayers::general::log::LogRelayPacketStatus;
@@ -112,7 +112,7 @@ where
         + for<'a> CanLog<LogSkipBuildUpdateClientMessage<'a, Relay, DestinationTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, SourceTarget>>
         + for<'a> CanLog<LogWaitUpdateClientHeightStatus<'a, Relay, DestinationTarget>>,
-    Components: DelegatesToDefaultRelayComponents
+    Components: DelegatesToDefaultRelayPreset
         + RelayPacketFilter<Relay>
         + ErrorRaiser<Relay, EmptyMessageResponse>
         + ErrorRaiser<Relay, SrcChain::Error>

diff --git a/crates/relayer/relayer-components/src/components/default/relay.rs b/crates/relayer/relayer-components/src/components/default/relay.rs
@@ -53,7 +53,7 @@ pub use crate::relay::traits::packet_relayers::timeout_unordered_packet::Timeout
 pub use crate::relay::traits::update_client_message_builder::TargetUpdateClientMessageBuilderComponent;
 
 cgp_preset! {
-    DefaultRelayComponents {
+    DefaultRelayPreset {
         IbcMessageSenderComponent<MainSink>: SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>,
         TargetUpdateClientMessageBuilderComponent: SkipUpdateClient<WaitUpdateClient<BuildUpdateClientMessages>>,
         PacketRelayerComponent: LockPacketRelayer<LoggerRelayer<FilterRelayer<FullCycleRelayer>>>,

diff --git a/crates/solomachine/solomachine-relayer/src/contexts/relay.rs b/crates/solomachine/solomachine-relayer/src/contexts/relay.rs
@@ -14,7 +14,7 @@ use hermes_relayer_components::multi::traits::client_id_at::ClientIdAtGetterComp
 use hermes_relayer_components::multi::types::tags::{Dst, Src};
 use hermes_relayer_components::relay::traits::chains::HasRelayClientIds;
 use hermes_relayer_components::relay::traits::connection::open_init::CanInitConnection;
-use hermes_relayer_components::with_default_relay_components;
+use hermes_relayer_components::with_default_relay_preset;
 use hermes_runtime::types::runtime::HermesRuntime;
 use hermes_runtime_components::traits::runtime::{RuntimeGetterComponent, RuntimeTypeComponent};
 use ibc::core::host::types::identifiers::ClientId;
@@ -32,11 +32,11 @@ pub struct SolomachineRelay {
 
 pub struct SolomachineRelayComponents;
 
-with_default_relay_components! {
+with_default_relay_preset! {
     | Components | {
         delegate_components! {
             SolomachineRelayComponents {
-                Components : DefaultRelayComponents,
+                Components : DefaultRelayPreset,
             }
         }
     }