From 9a8a0479d03c7ac5fd1493a31989190fd1201393 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 8 May 2018 10:27:04 -0400 Subject: [PATCH] [bin/grin] Make peer IP/port mandatory for ban/unban commands (#1042) By default, clap args are optional. Make them required, since otherwise the commands can't do anything. --- src/bin/grin.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/bin/grin.rs b/src/bin/grin.rs index 90951e6b7..a57c55f54 100644 --- a/src/bin/grin.rs +++ b/src/bin/grin.rs @@ -164,6 +164,7 @@ fn main() { .short("p") .long("peer") .help("Peer ip and port (e.g. 10.12.12.13:13414)") + .required(true) .takes_value(true))) .subcommand(SubCommand::with_name("unban") .about("Unban peer") @@ -171,6 +172,7 @@ fn main() { .short("p") .long("peer") .help("Peer ip and port (e.g. 10.12.12.13:13414)") + .required(true) .takes_value(true)))) @@ -475,21 +477,21 @@ fn client_command(client_args: &ArgMatches, global_config: GlobalConfig) { client::list_connected_peers(&server_config); } ("ban", Some(peer_args)) => { - if let Some(peer) = peer_args.value_of("peer") { - if let Ok(addr) = peer.parse() { - client::ban_peer(&server_config, &addr); - } else { - panic!("Invalid peer address format"); - } + let peer = peer_args.value_of("peer").unwrap(); + + if let Ok(addr) = peer.parse() { + client::ban_peer(&server_config, &addr); + } else { + panic!("Invalid peer address format"); } } ("unban", Some(peer_args)) => { - if let Some(peer) = peer_args.value_of("peer") { - if let Ok(addr) = peer.parse() { - client::unban_peer(&server_config, &addr); - } else { - panic!("Invalid peer address format"); - } + let peer = peer_args.value_of("peer").unwrap(); + + if let Ok(addr) = peer.parse() { + client::unban_peer(&server_config, &addr); + } else { + panic!("Invalid peer address format"); } } _ => panic!("Unknown client command, use 'grin help client' for details"),