From 387076e04a1a1464389d617eee45d94093d7fabf Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Wed, 15 Aug 2018 11:44:00 -0600
Subject: [PATCH] Fix early return for invalid parameter

---
 src/rpc.rs | 70 ++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/rpc.rs b/src/rpc.rs
index 62e7635e4d5583..d712b5eb90399a 100644
--- a/src/rpc.rs
+++ b/src/rpc.rs
@@ -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> {