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

4
client/src/mock_sender.rs
View File

@ -30,7 +30,7 @@ use {
transaction::{self, Transaction, TransactionError},
},
solana_transaction_status::{
EncodedConfirmedBlock, EncodedConfirmedTransaction, EncodedTransaction,
EncodedConfirmedBlock, EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
EncodedTransactionWithStatusMeta, Rewards, TransactionConfirmationStatus,
TransactionStatus, UiCompiledInstruction, UiMessage, UiRawMessage, UiTransaction,
UiTransactionEncoding, UiTransactionStatusMeta,
@ -185,7 +185,7 @@ impl RpcSender for MockSender {
value: statuses,
})?
}
"getTransaction" => serde_json::to_value(EncodedConfirmedTransaction {
"getTransaction" => serde_json::to_value(EncodedConfirmedTransactionWithStatusMeta {
slot: 2,
transaction: EncodedTransactionWithStatusMeta {
transaction: EncodedTransaction::Json(

12
client/src/rpc_client.rs
View File

@ -43,8 +43,8 @@ use {
transaction::{self, uses_durable_nonce, Transaction},
},
solana_transaction_status::{
EncodedConfirmedBlock, EncodedConfirmedTransaction, TransactionStatus, UiConfirmedBlock,
UiTransactionEncoding,
EncodedConfirmedBlock, EncodedConfirmedTransactionWithStatusMeta, TransactionStatus,
UiConfirmedBlock, UiTransactionEncoding,
},
solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
std::{
@ -2943,7 +2943,7 @@ impl RpcClient {
&self,
signature: &Signature,
encoding: UiTransactionEncoding,
) -> ClientResult<EncodedConfirmedTransaction> {
) -> ClientResult<EncodedConfirmedTransactionWithStatusMeta> {
self.send(
self.maybe_map_request(RpcRequest::GetTransaction)?,
json!([signature.to_string(), encoding]),
@ -3006,7 +3006,7 @@ impl RpcClient {
&self,
signature: &Signature,
config: RpcTransactionConfig,
) -> ClientResult<EncodedConfirmedTransaction> {
) -> ClientResult<EncodedConfirmedTransactionWithStatusMeta> {
self.send(
self.maybe_map_request(RpcRequest::GetTransaction)?,
json!([signature.to_string(), config]),
@ -3022,7 +3022,7 @@ impl RpcClient {
&self,
signature: &Signature,
encoding: UiTransactionEncoding,
) -> ClientResult<EncodedConfirmedTransaction> {
) -> ClientResult<EncodedConfirmedTransactionWithStatusMeta> {
self.send(
RpcRequest::GetConfirmedTransaction,
json!([signature.to_string(), encoding]),
@ -3038,7 +3038,7 @@ impl RpcClient {
&self,
signature: &Signature,
config: RpcConfirmedTransactionConfig,
) -> ClientResult<EncodedConfirmedTransaction> {
) -> ClientResult<EncodedConfirmedTransactionWithStatusMeta> {
self.send(
RpcRequest::GetConfirmedTransaction,
json!([signature.to_string(), config]),