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

16
rpc/src/rpc.rs
View File

@ -76,9 +76,9 @@ use {
solana_storage_bigtable::Error as StorageError,
solana_streamer::socket::SocketAddrSpace,
solana_transaction_status::{
ConfirmedBlock, ConfirmedTransactionStatusWithSignature, EncodedConfirmedTransaction,
Reward, RewardType, TransactionConfirmationStatus, TransactionStatus, UiConfirmedBlock,
UiTransactionEncoding,
ConfirmedBlock, ConfirmedTransactionStatusWithSignature, Encodable,
EncodedConfirmedTransactionWithStatusMeta, Reward, RewardType,
TransactionConfirmationStatus, TransactionStatus, UiConfirmedBlock, UiTransactionEncoding,
},
solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY},
spl_token::{
@ -1358,7 +1358,7 @@ impl JsonRpcRequestProcessor {
&self,
signature: Signature,
config: Option<RpcEncodingConfigWrapper<RpcTransactionConfig>>,
) -> Result<Option<EncodedConfirmedTransaction>> {
) -> Result<Option<EncodedConfirmedTransactionWithStatusMeta>> {
let config = config
.map(|config| config.convert_to_current())
.unwrap_or_default();
@ -3214,7 +3214,7 @@ pub mod rpc_full {
meta: Self::Metadata,
signature_str: String,
config: Option<RpcEncodingConfigWrapper<RpcTransactionConfig>>,
) -> BoxFuture<Result<Option<EncodedConfirmedTransaction>>>;
) -> BoxFuture<Result<Option<EncodedConfirmedTransactionWithStatusMeta>>>;
#[rpc(meta, name = "getSignaturesForAddress")]
fn get_signatures_for_address(
@ -3689,7 +3689,7 @@ pub mod rpc_full {
meta: Self::Metadata,
signature_str: String,
config: Option<RpcEncodingConfigWrapper<RpcTransactionConfig>>,
) -> BoxFuture<Result<Option<EncodedConfirmedTransaction>>> {
) -> BoxFuture<Result<Option<EncodedConfirmedTransactionWithStatusMeta>>> {
debug!("get_transaction rpc request received: {:?}", signature_str);
let signature = verify_signature(&signature_str);
if let Err(err) = signature {
@ -3928,7 +3928,7 @@ pub mod rpc_deprecated_v1_7 {
meta: Self::Metadata,
signature_str: String,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedTransactionConfig>>,
) -> BoxFuture<Result<Option<EncodedConfirmedTransaction>>>;
) -> BoxFuture<Result<Option<EncodedConfirmedTransactionWithStatusMeta>>>;
// DEPRECATED
#[rpc(meta, name = "getConfirmedSignaturesForAddress2")]
@ -3998,7 +3998,7 @@ pub mod rpc_deprecated_v1_7 {
meta: Self::Metadata,
signature_str: String,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedTransactionConfig>>,
) -> BoxFuture<Result<Option<EncodedConfirmedTransaction>>> {
) -> BoxFuture<Result<Option<EncodedConfirmedTransactionWithStatusMeta>>> {
debug!(
"get_confirmed_transaction rpc request received: {:?}",
signature_str