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

Handle potential panics

Browse Source
This commit is contained in:
Tyera Eulberg
2018-08-15 11:25:49 -06:00
committed by Tyera Eulberg
parent d9fac86015
commit cab75b7829
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc.rs
View File

@@ -94,9 +94,10 @@ impl RpcSol for RpcSolImpl {
type Metadata = Meta; type Metadata = Meta;
fn confirm_transaction(&self, meta: Self::Metadata, id: String) -> Result<bool> { fn confirm_transaction(&self, meta: Self::Metadata, id: String) -> Result<bool> {
let signature_vec = bs58::decode(id) let signature_vec = match bs58::decode(id).into_vec() {
.into_vec() Ok(signature_vec) => signature_vec,
.expect("base58-encoded public key"); Err(_) => return Err(Error::invalid_request()),
};
if signature_vec.len() != mem::size_of::<Signature>() { if signature_vec.len() != mem::size_of::<Signature>() {
Err(Error::invalid_request()) Err(Error::invalid_request())
@@ -120,9 +121,10 @@ impl RpcSol for RpcSolImpl {
} }
} }
fn get_balance(&self, meta: Self::Metadata, id: String) -> Result<(String, i64)> { fn get_balance(&self, meta: Self::Metadata, id: String) -> Result<(String, i64)> {
let pubkey_vec = bs58::decode(id) let pubkey_vec = match bs58::decode(id).into_vec() {
.into_vec() Ok(pubkey_vec) => pubkey_vec,
.expect("base58-encoded public key"); Err(_) => return Err(Error::invalid_request()),
};
if pubkey_vec.len() != mem::size_of::<Pubkey>() { if pubkey_vec.len() != mem::size_of::<Pubkey>() {
Err(Error::invalid_request()) Err(Error::invalid_request())