Add Account::is_frozen method

solana-labs · Aug 21, 2020 · e116f95 · e116f95
1 parent 6d09b9f
commit e116f95
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/token/program2/src/processor.rs b/token/program2/src/processor.rs
@@ -143,9 +143,7 @@ impl Processor {
         if source_account.mint != dest_account.mint {
             return Err(TokenError::MintMismatch.into());
         }
-        if source_account.is_initialized == AccountState::Frozen
-            || dest_account.is_initialized == AccountState::Frozen
-        {
+        if source_account.is_frozen() || dest_account.is_frozen() {
             return Err(TokenError::AccountFrozen.into());
         }
 
@@ -198,7 +196,7 @@ impl Processor {
         let delegate_info = next_account_info(account_info_iter)?;
         let owner_info = next_account_info(account_info_iter)?;
 
-        if source_account.is_initialized == AccountState::Frozen {
+        if source_account.is_frozen() {
             return Err(TokenError::AccountFrozen.into());
         }
 
@@ -224,7 +222,7 @@ impl Processor {
         let mut source_account: &mut Account = state::unpack(&mut source_data)?;
         let owner_info = next_account_info(account_info_iter)?;
 
-        if source_account.is_initialized == AccountState::Frozen {
+        if source_account.is_frozen() {
             return Err(TokenError::AccountFrozen.into());
         }
 
@@ -259,7 +257,7 @@ impl Processor {
             let mut account_data = account_info.data.borrow_mut();
             let mut account: &mut Account = state::unpack(&mut account_data)?;
 
-            if account.is_initialized == AccountState::Frozen {
+            if account.is_frozen() {
                 return Err(TokenError::AccountFrozen.into());
             }
 
@@ -326,7 +324,7 @@ impl Processor {
         let mut dest_account_data = dest_account_info.data.borrow_mut();
         let mut dest_account: &mut Account = state::unpack(&mut dest_account_data)?;
 
-        if dest_account.is_initialized == AccountState::Frozen {
+        if dest_account.is_frozen() {
             return Err(TokenError::AccountFrozen.into());
         }
 
@@ -378,7 +376,7 @@ impl Processor {
         if source_account.amount < amount {
             return Err(TokenError::InsufficientFunds.into());
         }
-        if source_account.is_initialized == AccountState::Frozen {
+        if source_account.is_frozen() {
             return Err(TokenError::AccountFrozen.into());
         }
 
@@ -461,7 +459,7 @@ impl Processor {
             return Err(TokenError::MintMismatch.into());
         }
         if freeze && source_account.is_initialized != AccountState::Initialized
-            || !freeze && source_account.is_initialized != AccountState::Frozen
+            || !freeze && !source_account.is_frozen()
         {
             return Err(TokenError::InvalidState.into());
         }

diff --git a/token/program2/src/state.rs b/token/program2/src/state.rs
@@ -45,6 +45,12 @@ pub struct Account {
     /// The amount delegated
     pub delegated_amount: u64,
 }
+impl Account {
+    /// Checks if account is frozen
+    pub fn is_frozen(&self) -> bool {
+        self.is_initialized == AccountState::Frozen
+    }
+}
 impl IsInitialized for Account {
     fn is_initialized(&self) -> bool {
         self.is_initialized != AccountState::Uninitialized