-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Relay context refactoring, part 3 (#498)
* Implement SelectRelayChains * Use SelectRelayAToB in CosmosRelay * Implement MessageBatchSenderGetter for SelectRelayChains * Rename message batch sender fields * Use generic type aliases inside CosmosRelayFields * Define ExtraPacketRelayer to simplify constraint debugging of composed packet relayer * Add DefaultPacketRelayer * Add DefaultTargetUpdateClientMessageBuilder * Remove sketch abstract relay contexts
- Loading branch information
1 parent
be7d07f
commit 0b03530
Showing
20 changed files
with
325 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
62 changes: 62 additions & 0 deletions
62
crates/relayer/relayer-components-extra/src/relay/impls/packet_relayers/extra.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
use cgp::prelude::CanRaiseError; | ||
use hermes_chain_type_components::traits::types::timeout::HasTimeoutType; | ||
use hermes_logging_components::traits::has_logger::HasLogger; | ||
use hermes_logging_components::traits::logger::CanLog; | ||
use hermes_relayer_components::chain::traits::packet::fields::CanReadOutgoingPacketFields; | ||
use hermes_relayer_components::chain::traits::queries::chain_status::CanQueryChainStatus; | ||
use hermes_relayer_components::chain::traits::types::ibc::{HasChannelIdType, HasPortIdType}; | ||
use hermes_relayer_components::chain::traits::types::ibc_events::write_ack::HasWriteAckEvent; | ||
use hermes_relayer_components::error::impls::error::MaxRetryExceededError; | ||
use hermes_relayer_components::error::traits::retry::{HasMaxErrorRetry, HasRetryableError}; | ||
use hermes_relayer_components::relay::impls::packet_relayers::general::filter_relayer::FilterRelayer; | ||
use hermes_relayer_components::relay::impls::packet_relayers::general::full_relay::{ | ||
FullCycleRelayer, LogRelayPacketAction, | ||
}; | ||
use hermes_relayer_components::relay::impls::packet_relayers::general::lock::{ | ||
LockPacketRelayer, LogSkipRelayLockedPacket, | ||
}; | ||
use hermes_relayer_components::relay::impls::packet_relayers::general::log::{ | ||
LogRelayPacketStatus, LoggerRelayer, | ||
}; | ||
use hermes_relayer_components::relay::traits::chains::{HasRelayChains, HasRelayPacketType}; | ||
use hermes_relayer_components::relay::traits::packet_filter::CanFilterRelayPackets; | ||
use hermes_relayer_components::relay::traits::packet_lock::HasPacketLock; | ||
use hermes_relayer_components::relay::traits::packet_relayer::PacketRelayer; | ||
use hermes_relayer_components::relay::traits::packet_relayers::ack_packet::CanRelayAckPacket; | ||
use hermes_relayer_components::relay::traits::packet_relayers::receive_packet::CanRelayReceivePacket; | ||
use hermes_relayer_components::relay::traits::packet_relayers::timeout_unordered_packet::CanRelayTimeoutUnorderedPacket; | ||
|
||
use crate::relay::impls::packet_relayers::retry::RetryRelayer; | ||
|
||
pub struct ExtraPacketRelayer; | ||
|
||
impl<Relay, SrcChain, DstChain> PacketRelayer<Relay> for ExtraPacketRelayer | ||
where | ||
Relay: CanRelayAckPacket | ||
+ CanRelayReceivePacket | ||
+ CanRelayTimeoutUnorderedPacket | ||
+ HasLogger | ||
+ HasRelayChains<SrcChain = SrcChain, DstChain = DstChain> | ||
+ HasRelayPacketType | ||
+ CanFilterRelayPackets | ||
+ HasPacketLock | ||
+ HasMaxErrorRetry | ||
+ HasRetryableError | ||
+ CanRaiseError<SrcChain::Error> | ||
+ CanRaiseError<DstChain::Error> | ||
+ for<'a> CanRaiseError<MaxRetryExceededError<'a, Relay>>, | ||
SrcChain: CanQueryChainStatus + CanReadOutgoingPacketFields<DstChain>, | ||
DstChain: CanQueryChainStatus | ||
+ HasWriteAckEvent<Relay::SrcChain> | ||
+ HasChannelIdType<SrcChain> | ||
+ HasPortIdType<SrcChain> | ||
+ HasTimeoutType, | ||
Relay::Logger: for<'a> CanLog<LogRelayPacketAction<'a, Relay>> | ||
+ for<'a> CanLog<LogRelayPacketStatus<'a, Relay>> | ||
+ for<'a> CanLog<LogSkipRelayLockedPacket<'a, Relay>>, | ||
{ | ||
async fn relay_packet(relay: &Relay, packet: &Relay::Packet) -> Result<(), Relay::Error> { | ||
<LockPacketRelayer<LoggerRelayer<FilterRelayer<RetryRelayer<FullCycleRelayer>>>>>:: | ||
relay_packet(relay, packet).await | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
...c/relay/components/packet_relayers/mod.rs → ...ra/src/relay/impls/packet_relayers/mod.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
pub mod extra; | ||
pub mod retry; |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
pub mod components; | ||
pub mod impls; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/default.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
use cgp::prelude::CanRaiseError; | ||
use hermes_chain_components::traits::packet::fields::CanReadOutgoingPacketFields; | ||
use hermes_chain_components::traits::types::ibc::{HasChannelIdType, HasPortIdType}; | ||
use hermes_chain_components::traits::types::timestamp::HasTimeoutType; | ||
use hermes_logging_components::traits::has_logger::HasLogger; | ||
use hermes_logging_components::traits::logger::CanLog; | ||
|
||
use crate::chain::traits::queries::chain_status::CanQueryChainStatus; | ||
use crate::chain::traits::types::ibc_events::write_ack::HasWriteAckEvent; | ||
use crate::relay::impls::packet_relayers::general::filter_relayer::FilterRelayer; | ||
use crate::relay::impls::packet_relayers::general::full_relay::{ | ||
FullCycleRelayer, LogRelayPacketAction, | ||
}; | ||
use crate::relay::impls::packet_relayers::general::lock::{ | ||
LockPacketRelayer, LogSkipRelayLockedPacket, | ||
}; | ||
use crate::relay::impls::packet_relayers::general::log::{LogRelayPacketStatus, LoggerRelayer}; | ||
use crate::relay::traits::chains::{HasRelayChains, HasRelayPacketType}; | ||
use crate::relay::traits::packet_filter::CanFilterRelayPackets; | ||
use crate::relay::traits::packet_lock::HasPacketLock; | ||
use crate::relay::traits::packet_relayer::PacketRelayer; | ||
use crate::relay::traits::packet_relayers::ack_packet::CanRelayAckPacket; | ||
use crate::relay::traits::packet_relayers::receive_packet::CanRelayReceivePacket; | ||
use crate::relay::traits::packet_relayers::timeout_unordered_packet::CanRelayTimeoutUnorderedPacket; | ||
|
||
pub struct DefaultPacketRelayer; | ||
|
||
impl<Relay, SrcChain, DstChain> PacketRelayer<Relay> for DefaultPacketRelayer | ||
where | ||
Relay: CanRelayAckPacket | ||
+ CanRelayReceivePacket | ||
+ CanRelayTimeoutUnorderedPacket | ||
+ HasRelayPacketType | ||
+ HasLogger | ||
+ HasPacketLock | ||
+ CanFilterRelayPackets | ||
+ HasRelayChains<SrcChain = SrcChain, DstChain = DstChain> | ||
+ CanRaiseError<SrcChain::Error> | ||
+ CanRaiseError<DstChain::Error>, | ||
SrcChain: CanQueryChainStatus + CanReadOutgoingPacketFields<DstChain>, | ||
DstChain: CanQueryChainStatus | ||
+ HasWriteAckEvent<Relay::SrcChain> | ||
+ HasChannelIdType<SrcChain> | ||
+ HasPortIdType<SrcChain> | ||
+ HasTimeoutType, | ||
Relay::Logger: for<'a> CanLog<LogRelayPacketAction<'a, Relay>> | ||
+ for<'a> CanLog<LogRelayPacketStatus<'a, Relay>> | ||
+ for<'a> CanLog<LogSkipRelayLockedPacket<'a, Relay>>, | ||
{ | ||
async fn relay_packet(relay: &Relay, packet: &Relay::Packet) -> Result<(), Relay::Error> { | ||
<LockPacketRelayer<LoggerRelayer<FilterRelayer<FullCycleRelayer>>>>::relay_packet( | ||
relay, packet, | ||
) | ||
.await | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
crates/relayer/relayer-components/src/relay/impls/packet_relayers/general/mod.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
pub mod default; | ||
pub mod filter_relayer; | ||
pub mod full_relay; | ||
pub mod lock; | ||
|
Oops, something went wrong.