Revert "Refactor code to get block signatures in get_confirmed_signat…

…ures_for_address2 (solana-labs#20575)" This reverts commit 0fb94da.
identity-com · Nov 24, 2021 · 1f03539 · 1f03539
1 parent 3560eef
commit 1f03539
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 34 deletions.
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -84,6 +84,9 @@ rustc_version = "0.4"
 [[bench]]
 name = "banking_stage"
 
+[[bench]]
+name = "blockstore"
+
 [[bench]]
 name = "cluster_info"
 

diff --git a/ledger/benches/blockstore.rs → core/benches/blockstore.rs b/ledger/benches/blockstore.rs → core/benches/blockstore.rs
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -80,8 +80,5 @@ name = "solana_ledger"
 [[bench]]
 name = "sigverify_shreds"
 
-[[bench]]
-name = "blockstore"
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/ledger/src/blockstore.rs b/ledger/src/blockstore.rs
@@ -2396,35 +2396,6 @@ impl Blockstore {
             .map(|signatures| signatures.iter().map(|(_, signature)| *signature).collect())
     }
 
-    fn get_sorted_block_signatures(&self, slot: Slot) -> Result<Vec<Signature>> {
-        let block = self.get_complete_block(slot, false).map_err(|err| {
-            BlockstoreError::Io(IoError::new(
-                ErrorKind::Other,
-                format!("Unable to get block: {}", err),
-            ))
-        })?;
-
-        // Load all signatures for the block
-        let mut slot_signatures: Vec<_> = block
-            .transactions
-            .into_iter()
-            .filter_map(|transaction_with_meta| {
-                transaction_with_meta
-                    .transaction
-                    .signatures
-                    .into_iter()
-                    .next()
-            })
-            .collect();
-
-        // Reverse sort signatures as a way to entire a stable ordering within a slot, as
-        // the AddressSignatures column is ordered by signatures within a slot,
-        // not by block ordering
-        slot_signatures.sort_unstable_by(|a, b| b.cmp(a));
-
-        Ok(slot_signatures)
-    }
-
     pub fn get_confirmed_signatures_for_address2(
         &self,
         address: Pubkey,
@@ -2458,7 +2429,32 @@ impl Blockstore {
                 match transaction_status {
                     None => return Ok(vec![]),
                     Some((slot, _)) => {
-                        let mut slot_signatures = self.get_sorted_block_signatures(slot)?;
+                        let block = self.get_complete_block(slot, false).map_err(|err| {
+                            BlockstoreError::Io(IoError::new(
+                                ErrorKind::Other,
+                                format!("Unable to get block: {}", err),
+                            ))
+                        })?;
+
+                        // Load all signatures for the block
+                        let mut slot_signatures: Vec<_> = block
+                            .transactions
+                            .into_iter()
+                            .filter_map(|transaction_with_meta| {
+                                transaction_with_meta
+                                    .transaction
+                                    .signatures
+                                    .into_iter()
+                                    .next()
+                            })
+                            .collect();
+
+                        // Sort signatures as a way to entire a stable ordering within a slot, as
+                        // the AddressSignatures column is ordered by signatures within a slot,
+                        // not by block ordering
+                        slot_signatures.sort();
+                        slot_signatures.reverse();
+
                         if let Some(pos) = slot_signatures.iter().position(|&x| x == before) {
                             slot_signatures.truncate(pos + 1);
                         }
@@ -2484,7 +2480,32 @@ impl Blockstore {
                 match transaction_status {
                     None => (0, HashSet::new()),
                     Some((slot, _)) => {
-                        let mut slot_signatures = self.get_sorted_block_signatures(slot)?;
+                        let block = self.get_complete_block(slot, false).map_err(|err| {
+                            BlockstoreError::Io(IoError::new(
+                                ErrorKind::Other,
+                                format!("Unable to get block: {}", err),
+                            ))
+                        })?;
+
+                        // Load all signatures for the block
+                        let mut slot_signatures: Vec<_> = block
+                            .transactions
+                            .into_iter()
+                            .filter_map(|transaction_with_meta| {
+                                transaction_with_meta
+                                    .transaction
+                                    .signatures
+                                    .into_iter()
+                                    .next()
+                            })
+                            .collect();
+
+                        // Sort signatures as a way to entire a stable ordering within a slot, as
+                        // the AddressSignatures column is ordered by signatures within a slot,
+                        // not by block ordering
+                        slot_signatures.sort();
+                        slot_signatures.reverse();
+
                         if let Some(pos) = slot_signatures.iter().position(|&x| x == until) {
                             slot_signatures = slot_signatures.split_off(pos);
                         }