Unlock only if lock_result was Ok (solana-labs#34652)

brooksprumo · Jan 9, 2024 · 95f888a · 95f888a
1 parent 74fde2d
commit 95f888a
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/accounts-db/src/accounts.rs b/accounts-db/src/accounts.rs
@@ -636,18 +636,8 @@ impl Accounts {
     ) {
         let keys: Vec<_> = txs
             .zip(results)
-            .filter_map(|(tx, res)| match res {
-                Err(TransactionError::AccountLoadedTwice)
-                | Err(TransactionError::AccountInUse)
-                | Err(TransactionError::SanitizeFailure)
-                | Err(TransactionError::TooManyAccountLocks)
-                | Err(TransactionError::WouldExceedMaxBlockCostLimit)
-                | Err(TransactionError::WouldExceedMaxVoteCostLimit)
-                | Err(TransactionError::WouldExceedMaxAccountCostLimit)
-                | Err(TransactionError::WouldExceedAccountDataBlockLimit)
-                | Err(TransactionError::WouldExceedAccountDataTotalLimit) => None,
-                _ => Some(tx.get_account_locks_unchecked()),
-            })
+            .filter(|(_, res)| res.is_ok())
+            .map(|(tx, _)| tx.get_account_locks_unchecked())
             .collect();
         let mut account_locks = self.account_locks.lock().unwrap();
         debug!("bank unlock accounts");