From 451ea7c9b2537725351bdb8a258b0264457c4e8f Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 13 Dec 2021 08:48:39 -0700
Subject: [PATCH] Revert "fix checks in process_vote_authorize (backport
 #21465) (#21486)"

This reverts commit b1bf420524160e1b926c41d7242fd4c09435e7f3.
---
 cli/src/vote.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cli/src/vote.rs b/cli/src/vote.rs
index 3c4ba497bf..b29cfd7ac3 100644
--- a/cli/src/vote.rs
+++ b/cli/src/vote.rs
@@ -666,19 +666,24 @@ pub fn process_vote_authorize(
     let authorized = config.signers[authorized];
     let new_authorized_signer = new_authorized.map(|index| config.signers[index]);
 
+    check_unique_pubkeys(
+        (&authorized.pubkey(), "authorized_account".to_string()),
+        (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
+    )?;
+
     let (_, vote_state) = get_vote_account(rpc_client, vote_account_pubkey, config.commitment)?;
     match vote_authorize {
         VoteAuthorize::Voter => {
-            let current_epoch = rpc_client.get_epoch_info()?.epoch;
             let current_authorized_voter = vote_state
                 .authorized_voters()
-                .get_authorized_voter(current_epoch)
+                .last()
                 .ok_or_else(|| {
                     CliError::RpcRequestError(
                         "Invalid vote account state; no authorized voters found".to_string(),
                     )
-                })?;
-            check_current_authority(&current_authorized_voter, &authorized.pubkey())?;
+                })?
+                .1;
+            check_current_authority(current_authorized_voter, &authorized.pubkey())?;
             if let Some(signer) = new_authorized_signer {
                 if signer.is_interactive() {
                     return Err(CliError::BadParameter(format!(
@@ -689,10 +694,6 @@ pub fn process_vote_authorize(
             }
         }
         VoteAuthorize::Withdrawer => {
-            check_unique_pubkeys(
-                (&authorized.pubkey(), "authorized_account".to_string()),
-                (new_authorized_pubkey, "new_authorized_pubkey".to_string()),
-            )?;
             check_current_authority(&vote_state.authorized_withdrawer, &authorized.pubkey())?
         }
     }