Fix early return for invalid parameter

This commit is contained in:
Tyera Eulberg
2018-08-15 11:44:00 -06:00
committed by Tyera Eulberg
parent 9df3aa50d5
commit 64ea5126e0

View File

@ -100,8 +100,8 @@ impl RpcSol for RpcSolImpl {
}; };
if signature_vec.len() != mem::size_of::<Signature>() { if signature_vec.len() != mem::size_of::<Signature>() {
Err(Error::invalid_request()) return Err(Error::invalid_request());
} else { }
let signature = Signature::new(&signature_vec); let signature = Signature::new(&signature_vec);
let req = JsonRpcRequest::GetSignature { signature }; let req = JsonRpcRequest::GetSignature { signature };
let resp = meta.request_processor.process_request(req); let resp = meta.request_processor.process_request(req);
@ -119,7 +119,6 @@ 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 = match bs58::decode(id).into_vec() { let pubkey_vec = match bs58::decode(id).into_vec() {
Ok(pubkey_vec) => pubkey_vec, Ok(pubkey_vec) => pubkey_vec,
@ -127,8 +126,8 @@ impl RpcSol for RpcSolImpl {
}; };
if pubkey_vec.len() != mem::size_of::<Pubkey>() { if pubkey_vec.len() != mem::size_of::<Pubkey>() {
Err(Error::invalid_request()) return Err(Error::invalid_request());
} else { }
let pubkey = Pubkey::new(&pubkey_vec); let pubkey = Pubkey::new(&pubkey_vec);
let req = JsonRpcRequest::GetBalance { key: pubkey }; let req = JsonRpcRequest::GetBalance { key: pubkey };
let resp = meta.request_processor.process_request(req); let resp = meta.request_processor.process_request(req);
@ -146,7 +145,6 @@ impl RpcSol for RpcSolImpl {
}), }),
} }
} }
}
fn get_finality(&self, meta: Self::Metadata) -> Result<usize> { fn get_finality(&self, meta: Self::Metadata) -> Result<usize> {
let req = JsonRpcRequest::GetFinality; let req = JsonRpcRequest::GetFinality;
let resp = meta.request_processor.process_request(req); let resp = meta.request_processor.process_request(req);