Simplify trait bounds for CanBuildIbcTokenTransferMessage (#532)

informalsystems · Jan 27, 2025 · 61b94d9 · 61b94d9
1 parent 8e62668
commit 61b94d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs b/crates/cosmos/cosmos-test-components/src/chain/impls/messages/ibc_transfer.rs
@@ -1,6 +1,9 @@
 use cgp::prelude::HasAsyncErrorType;
 use hermes_cosmos_chain_components::traits::message::{CosmosMessage, ToCosmosMessage};
-use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
+use hermes_relayer_components::chain::traits::types::height::HasHeightType;
+use hermes_relayer_components::chain::traits::types::ibc::{HasChannelIdType, HasPortIdType};
+use hermes_relayer_components::chain::traits::types::message::HasMessageType;
+use hermes_relayer_components::chain::traits::types::timestamp::HasTimeoutType;
 use hermes_test_components::chain::traits::messages::ibc_transfer::IbcTokenTransferMessageBuilder;
 use hermes_test_components::chain::traits::types::address::HasAddressType;
 use hermes_test_components::chain::traits::types::amount::HasAmountType;
@@ -19,15 +22,13 @@ impl<Chain, Counterparty> IbcTokenTransferMessageBuilder<Chain, Counterparty>
 where
     Chain: HasAsyncErrorType
         + HasAddressType
+        + HasMessageType
+        + HasHeightType<Height = Height>
+        + HasTimeoutType<Timeout = Timestamp>
         + HasAmountType<Amount = Amount>
         + HasMemoType<Memo = Option<String>>
-        + HasIbcChainTypes<
-            Counterparty,
-            ChannelId = ChannelId,
-            PortId = PortId,
-            Height = Height,
-            Timeout = Timestamp,
-        >,
+        + HasChannelIdType<Counterparty, ChannelId = ChannelId>
+        + HasPortIdType<Counterparty, PortId = PortId>,
     Counterparty: HasAddressType,
     Chain::Message: From<CosmosMessage>,
 {

diff --git a/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs b/crates/test/test-components/src/chain/traits/messages/ibc_transfer.rs
@@ -1,6 +1,6 @@
 use cgp::prelude::*;
 use hermes_relayer_components::chain::traits::types::height::HasHeightType;
-use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
+use hermes_relayer_components::chain::traits::types::ibc::{HasChannelIdType, HasPortIdType};
 use hermes_relayer_components::chain::traits::types::message::HasMessageType;
 use hermes_relayer_components::chain::traits::types::timestamp::HasTimeoutType;
 
@@ -20,7 +20,8 @@ pub trait CanBuildIbcTokenTransferMessage<Counterparty>:
     + HasMessageType
     + HasHeightType
     + HasTimeoutType
-    + HasIbcChainTypes<Counterparty>
+    + HasChannelIdType<Counterparty>
+    + HasPortIdType<Counterparty>
 where
     Counterparty: HasAddressType,
 {