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

Reinstate commitment param to support old clients (#9324)

Browse Source 
automerge
This commit is contained in:
Tyera Eulberg
2020-04-06 12:10:06 -06:00
committed by GitHub
parent 543b6016ea
commit cc07c86aab
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/rpc.rs
View File

@ -57,7 +57,10 @@ pub struct JsonRpcConfig {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct RpcSignatureStatusConfig { pub struct RpcSignatureStatusConfig {
pub search_transaction_history: bool, pub search_transaction_history: Option<bool>,
// DEPRECATED
#[serde(flatten)]
pub commitment: Option<CommitmentConfig>,
} }
#[derive(Clone)] #[derive(Clone)]
@ -440,10 +443,16 @@ impl JsonRpcRequestProcessor {
) -> RpcResponse<Vec<Option<TransactionStatus>>> { ) -> RpcResponse<Vec<Option<TransactionStatus>>> {
let mut statuses: Vec<Option<TransactionStatus>> = vec![]; let mut statuses: Vec<Option<TransactionStatus>> = vec![];
// DEPRECATED
let commitment = config
.clone()
.and_then(|x| x.commitment)
.or_else(|| Some(CommitmentConfig::recent()));
let search_transaction_history = config let search_transaction_history = config
.map(|x| x.search_transaction_history) .and_then(|x| x.search_transaction_history)
.unwrap_or(false); .unwrap_or(false);
let bank = self.bank(Some(CommitmentConfig::recent())); let bank = self.bank(commitment);
for signature in signatures { for signature in signatures {
let status = if let Some(status) = self.get_transaction_status(signature, &bank) { let status = if let Some(status) = self.get_transaction_status(signature, &bank) {