From 526344c9ac499acce539f7c802d74594f00ec91a Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 16 Jan 2019 11:46:52 -0800
Subject: [PATCH] Log signature status uniformly

---
 src/rpc.rs | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/rpc.rs b/src/rpc.rs
index 08773cf83c..fd5e90e61b 100644
--- a/src/rpc.rs
+++ b/src/rpc.rs
@@ -220,25 +220,30 @@ impl RpcSol for RpcSolImpl {
             .read()
             .unwrap()
             .get_signature_status(signature);
-        if res.is_none() {
-            return Ok(RpcSignatureStatus::SignatureNotFound);
-        }
 
-        let status = match res.unwrap() {
-            Status::Reserved => {
-                // Report SignatureReserved as SignatureNotFound as SignatureReserved is
-                // transitory while the bank processes the associated transaction.
+        let status = {
+            if res.is_none() {
                 RpcSignatureStatus::SignatureNotFound
-            }
-            Status::Complete(res) => match res {
-                Ok(_) => RpcSignatureStatus::Confirmed,
-                Err(BankError::AccountInUse) => RpcSignatureStatus::AccountInUse,
-                Err(BankError::ProgramError(_, _)) => RpcSignatureStatus::ProgramRuntimeError,
-                Err(err) => {
-                    trace!("mapping {:?} to GenericFailure", err);
-                    RpcSignatureStatus::GenericFailure
+            } else {
+                match res.unwrap() {
+                    Status::Reserved => {
+                        // Report SignatureReserved as SignatureNotFound as SignatureReserved is
+                        // transitory while the bank processes the associated transaction.
+                        RpcSignatureStatus::SignatureNotFound
+                    }
+                    Status::Complete(res) => match res {
+                        Ok(_) => RpcSignatureStatus::Confirmed,
+                        Err(BankError::AccountInUse) => RpcSignatureStatus::AccountInUse,
+                        Err(BankError::ProgramError(_, _)) => {
+                            RpcSignatureStatus::ProgramRuntimeError
+                        }
+                        Err(err) => {
+                            trace!("mapping {:?} to GenericFailure", err);
+                            RpcSignatureStatus::GenericFailure
+                        }
+                    },
                 }
-            },
+            }
         };
         info!("get_signature_status rpc request status: {:?}", status);
         Ok(status)