fix: use matches to get a command

tari-project · Mar 4, 2022 · 4f35513 · 4f35513
1 parent 42ceba2
commit 4f35513
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/applications/tari_base_node/src/commands/command/mod.rs b/applications/tari_base_node/src/commands/command/mod.rs
@@ -34,7 +34,7 @@ use std::{str::FromStr, sync::Arc, time::Instant};
 
 use anyhow::Error;
 use async_trait::async_trait;
-use clap::{AppSettings, Parser, Subcommand};
+use clap::{Parser, Subcommand};
 use strum::{EnumVariantNames, VariantNames};
 use tari_common::GlobalConfig;
 use tari_comms::{
@@ -58,7 +58,6 @@ use tokio::sync::watch;
 use crate::{builder::BaseNodeContext, commands::parser::FromHex};
 
 #[derive(Debug, Parser)]
-#[clap(setting = AppSettings::NoBinaryName)]
 pub struct Args {
     #[clap(subcommand)]
     pub command: Command,

diff --git a/applications/tari_base_node/src/main.rs b/applications/tari_base_node/src/main.rs
@@ -101,9 +101,9 @@ use std::{
     time::{Duration, Instant},
 };
 
-use clap::Parser as _;
+use clap::{CommandFactory, FromArgMatches};
 use commands::{
-    command::{CommandContext, HandleCommand},
+    command::{Args, CommandContext, HandleCommand},
     parser::Parser,
     reader::{CommandEvent, CommandReader},
 };
@@ -422,7 +422,9 @@ async fn cli_loop(mut context: CommandContext) {
                             first_signal = false;
                             if !line.is_empty() {
                                 let sw = line.split_whitespace();
-                                let args = commands::command::Args::try_parse_from(sw);
+                                let args = Args::command().no_binary_name(true)
+                                    .try_get_matches_from(sw)
+                                    .and_then(|matches| Args::from_arg_matches(&matches));
                                 match args {
                                     Ok(args) => {
                                         let fut = context.handle_command(args.command);