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

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
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/rpc.rs
View File

@ -100,24 +100,23 @@ impl RpcSol for RpcSolImpl {
};
if signature_vec.len() != mem::size_of::<Signature>() {
Err(Error::invalid_request())
} else {
let signature = Signature::new(&signature_vec);
let req = JsonRpcRequest::GetSignature { signature };
let resp = meta.request_processor.process_request(req);
match resp {
Some(Response::SignatureStatus { signature_status }) => Ok(signature_status),
Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(),
data: None,
}),
None => Err(Error {
code: ErrorCode::ServerError(-32001),
message: "Server error: no node found".to_string(),
data: None,
}),
}
return Err(Error::invalid_request());
}
let signature = Signature::new(&signature_vec);
let req = JsonRpcRequest::GetSignature { signature };
let resp = meta.request_processor.process_request(req);
match resp {
Some(Response::SignatureStatus { signature_status }) => Ok(signature_status),
Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(),
data: None,
}),
None => Err(Error {
code: ErrorCode::ServerError(-32001),
message: "Server error: no node found".to_string(),
data: None,
}),
}
}
fn get_balance(&self, meta: Self::Metadata, id: String) -> Result<(String, i64)> {
@ -127,24 +126,23 @@ impl RpcSol for RpcSolImpl {
};
if pubkey_vec.len() != mem::size_of::<Pubkey>() {
Err(Error::invalid_request())
} else {
let pubkey = Pubkey::new(&pubkey_vec);
let req = JsonRpcRequest::GetBalance { key: pubkey };
let resp = meta.request_processor.process_request(req);
match resp {
Some(Response::Balance { key, val }) => Ok((bs58::encode(key).into_string(), val)),
Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(),
data: None,
}),
None => Err(Error {
code: ErrorCode::ServerError(-32001),
message: "Server error: no node found".to_string(),
data: None,
}),
}
return Err(Error::invalid_request());
}
let pubkey = Pubkey::new(&pubkey_vec);
let req = JsonRpcRequest::GetBalance { key: pubkey };
let resp = meta.request_processor.process_request(req);
match resp {
Some(Response::Balance { key, val }) => Ok((bs58::encode(key).into_string(), val)),
Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(),
data: None,
}),
None => Err(Error {
code: ErrorCode::ServerError(-32001),
message: "Server error: no node found".to_string(),
data: None,
}),
}
}
fn get_finality(&self, meta: Self::Metadata) -> Result<usize> {