[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.
This commit is contained in:
Casey Rodarmor 2018-05-08 10:27:04 -04:00 committed by Quentin Le Sceller
parent f90506d869
commit 9a8a0479d0

View file

@ -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"),