From b28407d98a44919a78916d1f8ce85cbdd2972996 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 16 Aug 2019 15:06:59 -0700 Subject: [PATCH] Permit keypair for deactivate-stake vote pubkey too (#5544) automerge --- wallet/src/wallet.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index 15e87d7f4b..e71324901b 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -291,7 +291,7 @@ pub fn parse_command( } ("deactivate-stake", Some(matches)) => { let stake_account_keypair = keypair_of(matches, "stake_account_keypair_file").unwrap(); - let vote_account_pubkey = value_of(matches, "vote_account_pubkey").unwrap(); + let vote_account_pubkey = pubkey_of(matches, "vote_account_pubkey").unwrap(); Ok(WalletCommand::DeactivateStake( stake_account_keypair, vote_account_pubkey, @@ -1865,7 +1865,7 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, ' .value_name("PUBKEY") .takes_value(true) .required(true) - .validator(is_pubkey) + .validator(is_pubkey_or_keypair) .help("The vote account to which the stake is currently delegated"), ) )