Fix merge conflicts

informalsystems · Jan 17, 2025 · 4f31851 · 4f31851
2 parents d701a5b + 4041cfd
commit 4f31851
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/crates/cli/cli-components/src/impls/commands/channel/create.rs b/crates/cli/cli-components/src/impls/commands/channel/create.rs
@@ -9,17 +9,15 @@ use hermes_logging_components::types::level::LevelInfo;
 use hermes_relayer_components::build::traits::builders::relay_builder::CanBuildRelay;
 use hermes_relayer_components::chain::traits::types::chain_id::HasChainIdType;
 use hermes_relayer_components::chain::traits::types::channel::HasInitChannelOptionsType;
-use hermes_relayer_components::chain::traits::types::ibc::HasClientIdType;
-use hermes_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
+use hermes_relayer_components::chain::traits::types::ibc::{HasClientIdType, HasIbcChainTypes};
 use hermes_relayer_components::multi::traits::chain_at::HasChainTypeAt;
 use hermes_relayer_components::multi::traits::relay_at::HasRelayTypeAt;
 use hermes_relayer_components::relay::impls::channel::bootstrap::CanBootstrapChannel;
 use hermes_relayer_components::relay::traits::chains::HasRelayChains;
 
 use crate::traits::build::CanLoadBuilder;
 use crate::traits::command::CommandRunner;
-use crate::traits::output::CanProduceOutput;
-use crate::traits::output::HasOutputType;
+use crate::traits::output::{CanProduceOutput, HasOutputType};
 use crate::traits::parse::CanParseArg;
 
 pub struct RunCreateChannelCommand;
@@ -145,12 +143,11 @@ where
         logger
             .log(
                 &format!(
-                    "Creating channel between {}:{} and {}:{} on connection {}...",
+                    "Creating channel between {}:{} and {}:{} ...",
                     target_chain_id,
                     target_client_id,
                     counterparty_chain_id,
                     counterparty_client_id,
-                    target_connection_id,
                 ),
                 &LevelInfo,
             )

diff --git a/crates/cli/cli-components/src/impls/parse/identifier.rs b/crates/cli/cli-components/src/impls/parse/identifier.rs
@@ -5,8 +5,7 @@ use hermes_cosmos_chain_components::types::channel::CosmosInitChannelOptions;
 use ibc::core::channel::types::channel::Order;
 use ibc::core::channel::types::Version;
 use ibc::core::host::types::error::IdentifierError;
-use ibc::core::host::types::identifiers::ConnectionId;
-use ibc::core::host::types::identifiers::PortId;
+use ibc::core::host::types::identifiers::{ConnectionId, PortId};
 
 use crate::traits::parse::ArgParser;
 
@@ -38,7 +37,7 @@ pub struct ParseInitCosmosChannelOptions;
 
 impl<App, Args, Tag> ArgParser<App, Args, Tag> for ParseInitCosmosChannelOptions
 where
-    App: CanRaiseAsyncError<IdentifierError>,
+    App: HasAsyncErrorType,
     Args: HasField<symbol!("target_connection_id"), Value = String>
         + HasField<symbol!("version"), Value = String>
         + HasField<symbol!("ordering"), Value = String>,

diff --git a/crates/cli/cli/src/contexts/app.rs b/crates/cli/cli/src/contexts/app.rs
@@ -317,7 +317,7 @@ pub trait CanUseHermesApp:
     + CanRunCommand<QueryBalanceArgs>
     + CanRunCommand<CreateClientArgs>
     + CanRunCommand<CreateConnectionArgs>
-    + CanRunCommand<CreateChannelArgs>
+    // + CanRunCommand<CreateChannelArgs>
     + CanRunCommand<UpdateClientArgs>
     + CanRunCommand<BootstrapChainArgs>
     + CanRunCommand<QueryChannelSubCommand>