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

RPC: add err field to TransactionStatus, alongside the now deprecated status field (#9296)

Browse Source 
automerge
This commit is contained in:
Michael Vines
2020-04-04 16:13:26 -07:00
committed by GitHub
parent 8cdf406dd3
commit ad0997e15f
12 changed files with 143 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ledger/src/blockstore.rs
View File

@ -37,8 +37,8 @@ use solana_sdk::{
transaction::Transaction,
};
use solana_transaction_status::{
ConfirmedBlock, EncodedTransaction, Rewards, TransactionEncoding, TransactionStatusMeta,
TransactionWithStatusMeta,
ConfirmedBlock, EncodedTransaction, Rewards, RpcTransactionStatusMeta, TransactionEncoding,
TransactionStatusMeta, TransactionWithStatusMeta,
};
use solana_vote_program::{vote_instruction::VoteInstruction, vote_state::TIMESTAMP_SLOT_INTERVAL};
use std::{
@ -1500,7 +1500,8 @@ impl Blockstore {
meta: self
.transaction_status_cf
.get((slot, signature))
.expect("Expect database get to succeed"),
.expect("Expect database get to succeed")
.map(RpcTransactionStatusMeta::from),
}
})
.collect()
@ -4848,7 +4849,7 @@ pub mod tests {
.put_meta_bytes(slot - 1, &serialize(&parent_meta).unwrap())
.unwrap();
let expected_transactions: Vec<(Transaction, Option<TransactionStatusMeta>)> = entries
let expected_transactions: Vec<(Transaction, Option<RpcTransactionStatusMeta>)> = entries
.iter()
.cloned()
.filter(|entry| !entry.is_tick())
@ -4887,12 +4888,15 @@ pub mod tests {
.unwrap();
(
transaction,
Some(TransactionStatusMeta {
status: Ok(()),
fee: 42,
pre_balances,
post_balances,
}),
Some(
TransactionStatusMeta {
status: Ok(()),
fee: 42,
pre_balances,
post_balances,
}
.into(),
),
)
})
.collect();