blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: remove unwraps from client code, fixes #6915 (#6927)

This commit is contained in:
Sunny Gleason 2019-11-13 16:41:54 -05:00 committed by Michael Vines
parent f83254d760
commit e2fb9ac829
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/src/rpc_client.rs
View File

@ -410,9 +410,14 @@ impl RpcClient {
} }
pub fn get_account(&self, pubkey: &Pubkey) -> io::Result<Account> { pub fn get_account(&self, pubkey: &Pubkey) -> io::Result<Account> {
Ok(self self.get_account_with_commitment(pubkey, CommitmentConfig::default())?
.get_account_with_commitment(pubkey, CommitmentConfig::default()) .value
.map(|x| x.value.unwrap())?) .ok_or_else(|| {
io::Error::new(
io::ErrorKind::Other,
format!("AccountNotFound: pubkey={}", pubkey),
)
})
} }
pub fn get_account_with_commitment( pub fn get_account_with_commitment(
@ -449,7 +454,7 @@ impl RpcClient {
} }
pub fn get_account_data(&self, pubkey: &Pubkey) -> io::Result<Vec<u8>> { pub fn get_account_data(&self, pubkey: &Pubkey) -> io::Result<Vec<u8>> {
Ok(self.get_account(pubkey).unwrap().data) Ok(self.get_account(pubkey)?.data)
} }
pub fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> io::Result<u64> { pub fn get_minimum_balance_for_rent_exemption(&self, data_len: usize) -> io::Result<u64> {
@ -802,8 +807,7 @@ impl RpcClient {
); );
match response { match response {
Ok(confirmation) => { Ok(Value::Bool(signature_status)) => {
let signature_status = confirmation.as_bool().unwrap();
if signature_status { if signature_status {
trace!("Response found signature"); trace!("Response found signature");
} else { } else {
@ -812,6 +816,12 @@ impl RpcClient {
return signature_status; return signature_status;
} }
Ok(other) => {
debug!(
"check_signature request failed, expected bool, got: {:?}",
other
);
}
Err(err) => { Err(err) => {
debug!("check_signature request failed: {:?}", err); debug!("check_signature request failed: {:?}", err);
} }