Fix active vote account close error (#26250) (#26297)

(cherry picked from commit fa77cc5) Co-authored-by: Justin Starry <[email protected]>
solana-labs · Jun 28, 2022 · 8a11926 · 8a11926
1 parent e6f68e0
commit 8a11926
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/programs/vote/src/vote_error.rs b/programs/vote/src/vote_error.rs
@@ -64,6 +64,9 @@ pub enum VoteError {
 
     #[error("Proposed root is not in slot hashes")]
     RootOnDifferentFork,
+
+    #[error("Cannot close vote account unless it stopped voting at least one full epoch ago")]
+    ActiveVoteAccountClose,
 }
 
 impl<E> DecodeError<E> for VoteError {

diff --git a/programs/vote/src/vote_processor.rs b/programs/vote/src/vote_processor.rs
@@ -1207,7 +1207,7 @@ mod tests {
             &serialize(&VoteInstruction::Withdraw(lamports)).unwrap(),
             transaction_accounts.clone(),
             instruction_accounts.clone(),
-            Err(InstructionError::ActiveVoteAccountClose),
+            Err(VoteError::ActiveVoteAccountClose.into()),
         );
 
         // Both features disabled:

diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs
@@ -1306,7 +1306,7 @@ pub fn withdraw<S: std::hash::BuildHasher>(
 
         if reject_active_vote_account_close {
             datapoint_debug!("vote-account-close", ("reject-active", 1, i64));
-            return Err(InstructionError::ActiveVoteAccountClose);
+            return Err(VoteError::ActiveVoteAccountClose.into());
         } else {
             // Deinitialize upon zero-balance
             datapoint_debug!("vote-account-close", ("allow", 1, i64));