Wiring things up

informalsystems · Jan 9, 2025 · ba18f0d · ba18f0d
1 parent fb6dc8c
commit ba18f0d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/crates/cli/cli-components/src/impls/commands/queries/client.rs b/crates/cli/cli-components/src/impls/commands/queries/client.rs
@@ -1,6 +1,5 @@
 use crate::impls::commands::queries::client_state::QueryClientStateArgs;
 use crate::impls::commands::queries::client_status::QueryClientStatusArgs;
-use crate::impls::commands::queries::clients::QueryClientsArgs;
 use crate::impls::commands::queries::consensus_state::QueryConsensusStateArgs;
 use crate::traits::command::{CanRunCommand, CommandRunner};
 
@@ -16,17 +15,13 @@ pub enum QueryClientSubCommand {
 
     /// Query the consensus state of a client
     Consensus(QueryConsensusStateArgs),
-
-    /// Query all clients for a chain
-    Clients(QueryClientsArgs),
 }
 
 impl<App> CommandRunner<App, QueryClientSubCommand> for RunQueryClientSubCommand
 where
     App: CanRunCommand<QueryClientStateArgs>
         + CanRunCommand<QueryClientStatusArgs>
-        + CanRunCommand<QueryConsensusStateArgs>
-        + CanRunCommand<QueryClientsArgs>,
+        + CanRunCommand<QueryConsensusStateArgs>,
 {
     async fn run_command(
         app: &App,
@@ -36,7 +31,6 @@ where
             QueryClientSubCommand::State(args) => app.run_command(args).await,
             QueryClientSubCommand::Status(args) => app.run_command(args).await,
             QueryClientSubCommand::Consensus(args) => app.run_command(args).await,
-            QueryClientSubCommand::Clients(args) => app.run_command(args).await,
         }
     }
 }
diff --git a/crates/cli/cli/src/commands/query/mod.rs b/crates/cli/cli/src/commands/query/mod.rs
@@ -1,6 +1,3 @@
-mod clients;
-pub use clients::QueryClients;
-
 mod connections;
 pub use connections::QueryConnections;
 
@@ -13,6 +10,7 @@ pub use channels::QueryChannels;
 mod packet;
 use hermes_cli_components::impls::commands::queries::chain::QueryChainSubCommand;
 use hermes_cli_components::impls::commands::queries::client::QueryClientSubCommand;
+use hermes_cli_components::impls::commands::queries::clients::QueryClientsArgs;
 use hermes_cli_components::impls::commands::queries::connection::QueryConnectionSubCommand;
 use hermes_cli_components::impls::commands::queries::wallet::QueryWalletSubCommand;
 use hermes_cli_components::traits::command::CanRunCommand;
@@ -27,7 +25,7 @@ use crate::Result;
 #[derive(Debug, clap::Subcommand)]
 pub enum QueryCommands {
     /// Query all clients
-    Clients(QueryClients),
+    Clients(QueryClientsArgs),
 
     /// Query all connections
     Connections(QueryConnections),
@@ -66,7 +64,7 @@ impl CommandRunner<HermesApp> for QueryCommands {
             Self::Wallet(cmd) => app.run_command(cmd).await,
             Self::Chain(cmd) => app.run_command(cmd).await,
             Self::Client(cmd) => app.run_command(cmd).await,
-            Self::Clients(cmd) => cmd.run(app).await,
+            Self::Clients(cmd) => app.run_command(cmd).await,
             Self::Connection(cmd) => app.run_command(cmd).await,
             Self::Connections(cmd) => cmd.run(app).await,
             Self::Channels(cmd) => cmd.run(app).await,

diff --git a/crates/cli/cli/src/contexts/app.rs b/crates/cli/cli/src/contexts/app.rs
@@ -38,6 +38,9 @@ use hermes_cli_components::impls::commands::queries::client_state::{
 use hermes_cli_components::impls::commands::queries::client_status::{
     QueryClientStatusArgs, RunQueryClientStatusCommand,
 };
+use hermes_cli_components::impls::commands::queries::clients::{
+    QueryClientsArgs, RunQueryClientsCommand,
+};
 use hermes_cli_components::impls::commands::queries::connection::{
     QueryConnectionSubCommand, RunQueryConnectionSubCommand,
 };
@@ -164,6 +167,9 @@ delegate_components! {
         (QueryChannelEndArgs, symbol!("channel_id")): ParseFromString<ChannelId>,
         (QueryChannelEndArgs, symbol!("height")): ParseFromOptionalString<Height>,
 
+        (QueryClientsArgs, symbol!("host_chain_id")): ParseFromString<ChainId>,
+        (QueryClientsArgs, symbol!("reference_chain_id")): ParseFromOptionalString<ChainId>,
+
         (QueryClientStateArgs, symbol!("chain_id")): ParseFromString<ChainId>,
         (QueryClientStateArgs, symbol!("client_id")): ParseFromString<ClientId>,
         (QueryClientStateArgs, symbol!("height")): ParseFromOptionalString<Height>,
@@ -204,6 +210,7 @@ delegate_components! {
         QueryChainSubCommand: RunQueryChainSubCommand,
         QueryChainStatusArgs: RunQueryChainStatusCommand,
 
+        QueryClientsArgs: RunQueryClientsCommand,
         QueryClientSubCommand: RunQueryClientSubCommand,
         QueryClientStateArgs: RunQueryClientStateCommand,
         QueryClientStatusArgs: RunQueryClientStatusCommand,
@@ -280,6 +287,7 @@ pub trait CanUseHermesApp:
     + CanLoadBuilder
     + CanRunCommand<StartRelayerArgs>
     + CanRunCommand<QueryClientSubCommand>
+    + CanRunCommand<QueryClientsArgs>
     + CanRunCommand<QueryClientStateArgs>
     + CanRunCommand<QueryConsensusStateArgs>
     + CanRunCommand<QueryClientStatusArgs>