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

Remove unused serialization attributes from transaction status types (#22228)

Browse Source
This commit is contained in:
Justin Starry
2022-01-03 16:20:57 +08:00
committed by GitHub
parent d6ec103bee
commit ce6c76e45f
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
transaction-status/src/lib.rs
View File

@ -25,7 +25,6 @@ use {
solana_sdk::{ solana_sdk::{
clock::{Slot, UnixTimestamp}, clock::{Slot, UnixTimestamp},
commitment_config::CommitmentConfig, commitment_config::CommitmentConfig,
deserialize_utils::default_on_eof,
instruction::CompiledInstruction, instruction::CompiledInstruction,
message::{Message, MessageHeader}, message::{Message, MessageHeader},
pubkey::Pubkey, pubkey::Pubkey,
@ -122,7 +121,7 @@ pub struct UiInnerInstructions {
pub instructions: Vec<UiInstruction>, pub instructions: Vec<UiInstruction>,
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq)]
pub struct TransactionTokenBalance { pub struct TransactionTokenBalance {
pub account_index: u8, pub account_index: u8,
pub mint: String, pub mint: String,
@ -181,22 +180,16 @@ impl From<InnerInstructions> for UiInnerInstructions {
} }
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct TransactionStatusMeta { pub struct TransactionStatusMeta {
pub status: Result<()>, pub status: Result<()>,
pub fee: u64, pub fee: u64,
pub pre_balances: Vec<u64>, pub pre_balances: Vec<u64>,
pub post_balances: Vec<u64>, pub post_balances: Vec<u64>,
#[serde(deserialize_with = "default_on_eof")]
pub inner_instructions: Option<Vec<InnerInstructions>>, pub inner_instructions: Option<Vec<InnerInstructions>>,
#[serde(deserialize_with = "default_on_eof")]
pub log_messages: Option<Vec<String>>, pub log_messages: Option<Vec<String>>,
#[serde(deserialize_with = "default_on_eof")]
pub pre_token_balances: Option<Vec<TransactionTokenBalance>>, pub pre_token_balances: Option<Vec<TransactionTokenBalance>>,
#[serde(deserialize_with = "default_on_eof")]
pub post_token_balances: Option<Vec<TransactionTokenBalance>>, pub post_token_balances: Option<Vec<TransactionTokenBalance>>,
#[serde(deserialize_with = "default_on_eof")]
pub rewards: Option<Rewards>, pub rewards: Option<Rewards>,
} }
@ -333,8 +326,7 @@ impl TransactionStatus {
} }
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct ConfirmedTransactionStatusWithSignature { pub struct ConfirmedTransactionStatusWithSignature {
pub signature: Signature, pub signature: Signature,
pub slot: Slot, pub slot: Slot,
@ -355,8 +347,7 @@ pub struct Reward {
pub type Rewards = Vec<Reward>; pub type Rewards = Vec<Reward>;
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, Default, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct ConfirmedBlock { pub struct ConfirmedBlock {
pub previous_blockhash: String, pub previous_blockhash: String,
pub blockhash: String, pub blockhash: String,
@ -499,11 +490,9 @@ impl Default for TransactionDetails {
} }
} }
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct ConfirmedTransaction { pub struct ConfirmedTransaction {
pub slot: Slot, pub slot: Slot,
#[serde(flatten)]
pub transaction: TransactionWithStatusMeta, pub transaction: TransactionWithStatusMeta,
pub block_time: Option<UnixTimestamp>, pub block_time: Option<UnixTimestamp>,
} }
@ -561,8 +550,7 @@ pub struct UiParsedMessage {
pub instructions: Vec<UiInstruction>, pub instructions: Vec<UiInstruction>,
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct TransactionWithStatusMeta { pub struct TransactionWithStatusMeta {
pub transaction: Transaction, pub transaction: Transaction,
pub meta: Option<TransactionStatusMeta>, pub meta: Option<TransactionStatusMeta>,