Enable any signer in various cli subcommands (#8844)

automerge
2020-03-13 17:06:33 -06:00
parent 9e0a26628b
commit 5c2cf04e10
4 changed files with 35 additions and 20 deletions
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -36,7 +36,7 @@ impl VoteSubCommands for App<'_, '_> {
                        .value_name("VOTE ACCOUNT KEYPAIR")
                        .takes_value(true)
                        .required(true)
-                        .validator(is_keypair_or_ask_keyword)
+                        .validator(is_valid_signer)
                        .help("Vote account keypair to fund"),
                )
                .arg(
@@ -107,7 +107,7 @@ impl VoteSubCommands for App<'_, '_> {
                        .value_name("AUTHORIZED VOTER KEYPAIR")
                        .takes_value(true)
                        .required(true)
-                        .validator(is_keypair)
+                        .validator(is_valid_signer)
                        .help("Authorized voter keypair"),
                )
        )