From a6daafc6a4f087101a849a28a334df34275ffcb6 Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Sat, 19 Oct 2024 10:27:29 +0200
Subject: [PATCH] refactor(txpool): small refactor for `InMemoryBlobStore` impl
 (#11886)

---
 crates/transaction-pool/src/blobstore/mem.rs | 28 +++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/crates/transaction-pool/src/blobstore/mem.rs b/crates/transaction-pool/src/blobstore/mem.rs
index 15160c2c3f..c98a01b88c 100644
--- a/crates/transaction-pool/src/blobstore/mem.rs
+++ b/crates/transaction-pool/src/blobstore/mem.rs
@@ -76,42 +76,26 @@ impl BlobStore for InMemoryBlobStore {
 
     // Retrieves the decoded blob data for the given transaction hash.
     fn get(&self, tx: B256) -> Result<Option<BlobTransactionSidecar>, BlobStoreError> {
-        let store = self.inner.store.read();
-        Ok(store.get(&tx).cloned())
+        Ok(self.inner.store.read().get(&tx).cloned())
     }
 
     fn contains(&self, tx: B256) -> Result<bool, BlobStoreError> {
-        let store = self.inner.store.read();
-        Ok(store.contains_key(&tx))
+        Ok(self.inner.store.read().contains_key(&tx))
     }
 
     fn get_all(
         &self,
         txs: Vec<B256>,
     ) -> Result<Vec<(B256, BlobTransactionSidecar)>, BlobStoreError> {
-        let mut items = Vec::with_capacity(txs.len());
         let store = self.inner.store.read();
-        for tx in txs {
-            if let Some(item) = store.get(&tx) {
-                items.push((tx, item.clone()));
-            }
-        }
-
-        Ok(items)
+        Ok(txs.into_iter().filter_map(|tx| store.get(&tx).map(|item| (tx, item.clone()))).collect())
     }
 
     fn get_exact(&self, txs: Vec<B256>) -> Result<Vec<BlobTransactionSidecar>, BlobStoreError> {
-        let mut items = Vec::with_capacity(txs.len());
         let store = self.inner.store.read();
-        for tx in txs {
-            if let Some(item) = store.get(&tx) {
-                items.push(item.clone());
-            } else {
-                return Err(BlobStoreError::MissingSidecar(tx))
-            }
-        }
-
-        Ok(items)
+        txs.into_iter()
+            .map(|tx| store.get(&tx).cloned().ok_or_else(|| BlobStoreError::MissingSidecar(tx)))
+            .collect()
     }
 
     fn get_by_versioned_hashes(