Review feedback. Refactor common code.

Co-authored-by: Lijun Wang <[email protected]>
anza-xyz · Oct 17, 2024 · 7df5259 · 7df5259
1 parent e312784
commit 7df5259
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/ledger/benches/blockstore.rs b/ledger/benches/blockstore.rs
@@ -157,7 +157,6 @@ fn bench_insert_data_shred_big(bench: &mut Bencher) {
 }
 
 #[bench]
-#[ignore]
 fn bench_write_transaction_memos(b: &mut Bencher) {
     let ledger_path = get_tmp_ledger_path_auto_delete!();
     let blockstore =
@@ -177,7 +176,6 @@ fn bench_write_transaction_memos(b: &mut Bencher) {
 }
 
 #[bench]
-#[ignore]
 fn bench_add_transaction_memos_to_batch(b: &mut Bencher) {
     let ledger_path = get_tmp_ledger_path_auto_delete!();
     let blockstore =
@@ -202,7 +200,6 @@ fn bench_add_transaction_memos_to_batch(b: &mut Bencher) {
 }
 
 #[bench]
-#[ignore]
 fn bench_write_transaction_status(b: &mut Bencher) {
     let ledger_path = get_tmp_ledger_path_auto_delete!();
     let blockstore =
@@ -236,7 +233,6 @@ fn bench_write_transaction_status(b: &mut Bencher) {
 }
 
 #[bench]
-#[ignore]
 fn bench_add_transaction_status_to_batch(b: &mut Bencher) {
     let ledger_path = get_tmp_ledger_path_auto_delete!();
     let blockstore =

diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
@@ -2892,30 +2892,55 @@ impl Blockstore {
         }
     }
 
-    pub fn write_transaction_status<'a>(
+    #[inline]
+    fn write_transaction_status_helper<'a, F>(
         &self,
         slot: Slot,
         signature: Signature,
         keys_with_writable: impl Iterator<Item = (&'a Pubkey, bool)>,
         status: TransactionStatusMeta,
         transaction_index: usize,
-    ) -> Result<()> {
+        mut write_fn: F,
+    ) -> Result<()>
+    where
+        F: FnMut(&Pubkey, Slot, u32, Signature, bool) -> Result<()>,
+    {
         let status = status.into();
         let transaction_index = u32::try_from(transaction_index)
             .map_err(|_| BlockstoreError::TransactionIndexOverflow)?;
         self.transaction_status_cf
             .put_protobuf((signature, slot), &status)?;
 
         for (address, writeable) in keys_with_writable {
-            self.address_signatures_cf.put(
-                (*address, slot, transaction_index, signature),
-                &AddressSignatureMeta { writeable },
-            )?;
+            write_fn(address, slot, transaction_index, signature, writeable)?;
         }
 
         Ok(())
     }
 
+    pub fn write_transaction_status<'a>(
+        &self,
+        slot: Slot,
+        signature: Signature,
+        keys_with_writable: impl Iterator<Item = (&'a Pubkey, bool)>,
+        status: TransactionStatusMeta,
+        transaction_index: usize,
+    ) -> Result<()> {
+        self.write_transaction_status_helper(
+            slot,
+            signature,
+            keys_with_writable,
+            status,
+            transaction_index,
+            |address, slot, tx_index, signature, writeable| {
+                self.address_signatures_cf.put(
+                    (*address, slot, tx_index, signature),
+                    &AddressSignatureMeta { writeable },
+                )
+            },
+        )
+    }
+
     pub fn add_transaction_status_to_batch<'a>(
         &self,
         slot: Slot,