gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor: cleanup solana_transaction_status crate (#22230)

Browse Source
This commit is contained in:
Justin Starry
2022-01-03 23:45:18 +08:00
committed by GitHub
parent 86acd8f6f9
commit 2a00382d71
10 changed files with 248 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ledger/src/blockstore.rs
View File

@ -41,8 +41,9 @@ use {
},
solana_storage_proto::{StoredExtendedRewards, StoredTransactionStatusMeta},
solana_transaction_status::{
ConfirmedBlock, ConfirmedTransaction, ConfirmedTransactionStatusWithSignature, Rewards,
TransactionStatusMeta, TransactionWithStatusMeta,
ConfirmedBlock, ConfirmedTransactionStatusWithSignature,
ConfirmedTransactionWithStatusMeta, Rewards, TransactionStatusMeta,
TransactionWithStatusMeta,
},
std::{
borrow::Cow,
@ -2307,7 +2308,7 @@ impl Blockstore {
pub fn get_rooted_transaction(
&self,
signature: Signature,
) -> Result<Option<ConfirmedTransaction>> {
) -> Result<Option<ConfirmedTransactionWithStatusMeta>> {
datapoint_info!(
"blockstore-rpc-api",
("method", "get_rooted_transaction".to_string(), String)
@ -2320,7 +2321,7 @@ impl Blockstore {
&self,
signature: Signature,
highest_confirmed_slot: Slot,
) -> Result<Option<ConfirmedTransaction>> {
) -> Result<Option<ConfirmedTransactionWithStatusMeta>> {
datapoint_info!(
"blockstore-rpc-api",
("method", "get_complete_transaction".to_string(), String)
@ -2337,7 +2338,7 @@ impl Blockstore {
&self,
signature: Signature,
confirmed_unrooted_slots: &[Slot],
) -> Result<Option<ConfirmedTransaction>> {
) -> Result<Option<ConfirmedTransactionWithStatusMeta>> {
if let Some((slot, status)) =
self.get_transaction_status(signature, confirmed_unrooted_slots)?
{
@ -2351,7 +2352,7 @@ impl Blockstore {
.ok_or(BlockstoreError::UnsupportedTransactionVersion)?;
let block_time = self.get_block_time(slot)?;
Ok(Some(ConfirmedTransaction {
Ok(Some(ConfirmedTransactionWithStatusMeta {
slot,
transaction: TransactionWithStatusMeta {
transaction,
@ -7171,7 +7172,7 @@ pub mod tests {
let signature = transaction.transaction.signatures[0];
assert_eq!(
blockstore.get_rooted_transaction(signature).unwrap(),
Some(ConfirmedTransaction {
Some(ConfirmedTransactionWithStatusMeta {
slot,
transaction: transaction.clone(),
block_time: None
@ -7181,7 +7182,7 @@ pub mod tests {
blockstore
.get_complete_transaction(signature, slot + 1)
.unwrap(),
Some(ConfirmedTransaction {
Some(ConfirmedTransactionWithStatusMeta {
slot,
transaction,
block_time: None
@ -7277,7 +7278,7 @@ pub mod tests {
blockstore
.get_complete_transaction(signature, slot)
.unwrap(),
Some(ConfirmedTransaction {
Some(ConfirmedTransactionWithStatusMeta {
slot,
transaction,
block_time: None