Move CLI logic into apps/lib

apps/src/bin/namada-client/main.rs

@@ -1,7 +1,7 @@
-mod cli;
-
 use color_eyre::eyre::Result;
-use namada_apps::logging;
+use namada_apps::cli::api::CliApi;
+use namada_apps::facade::tendermint_rpc::HttpClient;
+use namada_apps::{cli, logging};
 use tracing_subscriber::filter::LevelFilter;
 
 #[tokio::main]
@@ -13,5 +13,9 @@ async fn main() -> Result<()> {
     let _log_guard = logging::init_from_env_or(LevelFilter::INFO)?;
 
     // run the CLI
-    cli::main().await
+    CliApi::<()>::handle_client_command::<HttpClient>(
+        None,
+        cli::namada_client_cli()?,
+    )
+    .await
 }

apps/src/bin/namada-relayer/main.rs

@@ -1,7 +1,7 @@
-mod cli;
-
 use color_eyre::eyre::Result;
-use namada_apps::logging;
+use namada::tendermint_rpc::HttpClient;
+use namada_apps::cli::api::CliApi;
+use namada_apps::{cli, logging};
 use tracing_subscriber::filter::LevelFilter;
 
 #[tokio::main]
@@ -12,6 +12,7 @@ async fn main() -> Result<()> {
     // init logging
     logging::init_from_env_or(LevelFilter::INFO)?;
 
+    let (cmd, _) = cli::namada_relayer_cli()?;
     // run the CLI
-    cli::main().await
+    CliApi::<()>::handle_relayer_command::<HttpClient>(None, cmd).await
 }

apps/src/bin/namada-wallet/main.rs

@@ -1,9 +1,10 @@
-mod cli;
 use color_eyre::eyre::Result;
+use namada_apps::cli;
+use namada_apps::cli::api::CliApi;
 
 pub fn main() -> Result<()> {
     color_eyre::install()?;
-
+    let (cmd, ctx) = cli::namada_wallet_cli()?;
     // run the CLI
-    cli::main()
+    CliApi::<()>::handle_wallet_command(cmd, ctx)
 }

apps/src/lib/cli.rs

@@ -6,8 +6,12 @@
 //! client can be dispatched via `namada node ...` or `namada client ...`,
 //! respectively.
 
+pub mod api;
+pub mod client;
 pub mod context;
+pub mod relayer;
 mod utils;
+pub mod wallet;
 
 use clap::{ArgGroup, ArgMatches, ColorChoice};
 use color_eyre::eyre::Result;

apps/src/lib/cli/api.rs

@@ -0,0 +1,29 @@
+use std::marker::PhantomData;
+
+use namada::ledger::queries::Client;
+use namada::ledger::rpc::wait_until_node_is_synched;
+use namada::tendermint_rpc::HttpClient;
+use namada::types::control_flow::Halt;
+use tendermint_config::net::Address as TendermintAddress;
+
+use crate::client::utils;
+
+/// Trait for clients that can be used with the CLI.
+#[async_trait::async_trait(?Send)]
+pub trait CliClient: Client + Sync {
+    fn from_tendermint_address(address: &mut TendermintAddress) -> Self;
+    async fn wait_until_node_is_synced(&self) -> Halt<()>;
+}
+
+#[async_trait::async_trait(?Send)]
+impl CliClient for HttpClient {
+    fn from_tendermint_address(address: &mut TendermintAddress) -> Self {
+        HttpClient::new(utils::take_config_address(address)).unwrap()
+    }
+
+    async fn wait_until_node_is_synced(&self) -> Halt<()> {
+        wait_until_node_is_synched(self).await
+    }
+}
+
+pub struct CliApi<IO>(PhantomData<IO>);