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

Deprecate confirmTransaction, getSignatureStatus, and getSignatureConfirmation (#9298)

Browse Source 
* Deprecate `confirmTransaction`, `getSignatureStatus`, etc

* Rename get_signature_statuses to get_signature_statuses_with_commitment

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
Justin Starry
2020-04-05 14:31:24 +08:00
committed by GitHub
parent 49e2cc6593
commit b584174d67
5 changed files with 57 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/src/rpc.rs
View File

@ -425,7 +425,7 @@ impl JsonRpcRequestProcessor {
.map(|(_, status)| status)
}
pub fn get_signature_statuses(
pub fn get_signature_statuses_with_commitment(
&self,
signatures: Vec<Signature>,
commitment: Option<CommitmentConfig>,
@ -496,6 +496,7 @@ impl Metadata for Meta {}
pub trait RpcSol {
type Metadata;
// DEPRECATED
#[rpc(meta, name = "confirmTransaction")]
fn confirm_transaction(
&self,
@ -504,6 +505,24 @@ pub trait RpcSol {
commitment: Option<CommitmentConfig>,
) -> RpcResponse<bool>;
// DEPRECATED
#[rpc(meta, name = "getSignatureStatus")]
fn get_signature_status(
&self,
meta: Self::Metadata,
signature_str: String,
commitment: Option<CommitmentConfig>,
) -> Result<Option<transaction::Result<()>>>;
// DEPRECATED (used by Trust Wallet)
#[rpc(meta, name = "getSignatureConfirmation")]
fn get_signature_confirmation(
&self,
meta: Self::Metadata,
signature_str: String,
commitment: Option<CommitmentConfig>,
) -> Result<Option<RpcSignatureConfirmation>>;
#[rpc(meta, name = "getAccountInfo")]
fn get_account_info(
&self,
@ -591,24 +610,8 @@ pub trait RpcSol {
#[rpc(meta, name = "getFeeRateGovernor")]
fn get_fee_rate_governor(&self, meta: Self::Metadata) -> RpcResponse<RpcFeeRateGovernor>;
#[rpc(meta, name = "getSignatureConfirmation")]
fn get_signature_confirmation(
&self,
meta: Self::Metadata,
signature_str: String,
commitment: Option<CommitmentConfig>,
) -> Result<Option<RpcSignatureConfirmation>>;
#[rpc(meta, name = "getSignatureStatus")]
fn get_signature_status(
&self,
meta: Self::Metadata,
signature_str: String,
commitment: Option<CommitmentConfig>,
) -> Result<Option<transaction::Result<()>>>;
#[rpc(meta, name = "getSignatureStatuses")]
fn get_signature_statuses(
fn get_signature_statuses_with_commitment(
&self,
meta: Self::Metadata,
signature_strs: Vec<String>,
@ -970,7 +973,7 @@ impl RpcSol for RpcSolImpl {
.get_signature_status(signature, commitment))
}
fn get_signature_statuses(
fn get_signature_statuses_with_commitment(
&self,
meta: Self::Metadata,
signature_strs: Vec<String>,
@ -983,7 +986,7 @@ impl RpcSol for RpcSolImpl {
meta.request_processor
.read()
.unwrap()
.get_signature_statuses(signatures, commitment)
.get_signature_statuses_with_commitment(signatures, commitment)
}
fn get_slot(&self, meta: Self::Metadata, commitment: Option<CommitmentConfig>) -> Result<u64> {
@ -1076,7 +1079,7 @@ impl RpcSol for RpcSolImpl {
.request_processor
.read()
.unwrap()
.get_signature_statuses(vec![signature], commitment.clone())?
.get_signature_statuses_with_commitment(vec![signature], commitment.clone())?
.value[0]
.clone()
.map(|x| x.status);