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

get_program_accounts_with_config() now correctly defaults to RpcClient's commitment level (backport #17312) (#17315)

Browse Source 
* get_program_accounts_with_config() now correctly defaults to RpcClient's commitment level

(cherry picked from commit 63b97729e6)

# Conflicts:
#	client/src/rpc_client.rs

* Update rpc_client.rs

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-05-18 21:19:19 +00:00
committed by GitHub
parent 18c4d13ab2
commit 11f6c04990
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/rpc_client.rs
View File

@ -1016,8 +1016,7 @@ impl RpcClient {
RpcProgramAccountsConfig { RpcProgramAccountsConfig {
filters: None, filters: None,
account_config: RpcAccountInfoConfig { account_config: RpcAccountInfoConfig {
encoding: Some(UiAccountEncoding::Base64), encoding: Some(UiAccountEncoding::Base64Zstd),
commitment: Some(self.commitment_config),
..RpcAccountInfoConfig::default() ..RpcAccountInfoConfig::default()
}, },
}, },
@ -1029,7 +1028,10 @@ impl RpcClient {
pubkey: &Pubkey, pubkey: &Pubkey,
config: RpcProgramAccountsConfig, config: RpcProgramAccountsConfig,
) -> ClientResult<Vec<(Pubkey, Account)>> { ) -> ClientResult<Vec<(Pubkey, Account)>> {
let commitment = config.account_config.commitment.unwrap_or_default(); let commitment = config
.account_config
.commitment
.unwrap_or_else(|| self.commitment());
let commitment = self.maybe_map_commitment(commitment)?; let commitment = self.maybe_map_commitment(commitment)?;
let account_config = RpcAccountInfoConfig { let account_config = RpcAccountInfoConfig {
commitment: Some(commitment), commitment: Some(commitment),