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

Log signature status uniformly

This commit is contained in:
Michael Vines 2019-01-16 11:46:52 -08:00 committed by Grimes
parent f8bd19f5db
commit 526344c9ac
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rpc.rs
View File

@ -220,11 +220,12 @@ impl RpcSol for RpcSolImpl {
.read() .read()
.unwrap() .unwrap()
.get_signature_status(signature); .get_signature_status(signature);
if res.is_none() {
return Ok(RpcSignatureStatus::SignatureNotFound);
}
let status = match res.unwrap() { let status = {
if res.is_none() {
RpcSignatureStatus::SignatureNotFound
} else {
match res.unwrap() {
Status::Reserved => { Status::Reserved => {
// Report SignatureReserved as SignatureNotFound as SignatureReserved is // Report SignatureReserved as SignatureNotFound as SignatureReserved is
// transitory while the bank processes the associated transaction. // transitory while the bank processes the associated transaction.
@ -233,12 +234,16 @@ impl RpcSol for RpcSolImpl {
Status::Complete(res) => match res { Status::Complete(res) => match res {
Ok(_) => RpcSignatureStatus::Confirmed, Ok(_) => RpcSignatureStatus::Confirmed,
Err(BankError::AccountInUse) => RpcSignatureStatus::AccountInUse, Err(BankError::AccountInUse) => RpcSignatureStatus::AccountInUse,
Err(BankError::ProgramError(_, _)) => RpcSignatureStatus::ProgramRuntimeError, Err(BankError::ProgramError(_, _)) => {
RpcSignatureStatus::ProgramRuntimeError
}
Err(err) => { Err(err) => {
trace!("mapping {:?} to GenericFailure", err); trace!("mapping {:?} to GenericFailure", err);
RpcSignatureStatus::GenericFailure RpcSignatureStatus::GenericFailure
} }
}, },
}
}
}; };
info!("get_signature_status rpc request status: {:?}", status); info!("get_signature_status rpc request status: {:?}", status);
Ok(status) Ok(status)