From 12a3b1ba6a8a27dff80740fb32b51691f48f233f Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Thu, 21 May 2020 18:30:02 -0600
Subject: [PATCH] Fixup deserialize_bs58_transaction, and make a few error
 types more targeted (#10171)

automerge
---
 core/src/rpc.rs   | 35 +++++++++++++++++++----------------
 core/tests/rpc.rs |  4 ++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/src/rpc.rs b/core/src/rpc.rs
index e1fc60127b..d29b967ffb 100644
--- a/core/src/rpc.rs
+++ b/core/src/rpc.rs
@@ -663,11 +663,15 @@ fn get_tpu_addr(cluster_info: &ClusterInfo) -> Result<SocketAddr> {
 }
 
 fn verify_pubkey(input: String) -> Result<Pubkey> {
-    input.parse().map_err(|_e| Error::invalid_request())
+    input
+        .parse()
+        .map_err(|e| Error::invalid_params(format!("{:?}", e)))
 }
 
 fn verify_signature(input: &str) -> Result<Signature> {
-    input.parse().map_err(|_e| Error::invalid_request())
+    input
+        .parse()
+        .map_err(|e| Error::invalid_params(format!("{:?}", e)))
 }
 
 #[derive(Clone)]
@@ -1524,21 +1528,24 @@ impl RpcSol for RpcSolImpl {
 }
 
 fn deserialize_bs58_transaction(bs58_transaction: String) -> Result<(Vec<u8>, Transaction)> {
-    let wire_transaction = bs58::decode(bs58_transaction).into_vec().unwrap();
+    let wire_transaction = bs58::decode(bs58_transaction)
+        .into_vec()
+        .map_err(|e| Error::invalid_params(format!("{:?}", e)))?;
     if wire_transaction.len() >= PACKET_DATA_SIZE {
-        info!(
+        let err = format!(
             "transaction too large: {} bytes (max: {} bytes)",
             wire_transaction.len(),
             PACKET_DATA_SIZE
         );
-        return Err(Error::invalid_request());
+        info!("{}", err);
+        return Err(Error::invalid_params(&err));
     }
     bincode::config()
         .limit(PACKET_DATA_SIZE as u64)
         .deserialize(&wire_transaction)
         .map_err(|err| {
             info!("transaction deserialize error: {:?}", err);
-            Error::invalid_request()
+            Error::invalid_params(&err.to_string())
         })
         .map(|transaction| (wire_transaction, transaction))
 }
@@ -1552,7 +1559,7 @@ pub mod tests {
         replay_stage::tests::create_test_transactions_and_populate_blockstore,
     };
     use bincode::deserialize;
-    use jsonrpc_core::{MetaIoHandler, Output, Response, Value};
+    use jsonrpc_core::{ErrorCode, MetaIoHandler, Output, Response, Value};
     use solana_ledger::{
         blockstore::entries_to_test_shreds,
         blockstore_processor::fill_blockstore_slot_with_ticks,
@@ -2634,13 +2641,9 @@ pub mod tests {
 
         let req = r#"{"jsonrpc":"2.0","id":1,"method":"sendTransaction","params":["37u9WtQpcm6ULa3Vmu7ySnANv"]}"#;
         let res = io.handle_request_sync(req, meta);
-        let expected =
-            r#"{"jsonrpc":"2.0","error":{"code":-32600,"message":"Invalid request"},"id":1}"#;
-        let expected: Response =
-            serde_json::from_str(expected).expect("expected response deserialization");
-        let result: Response = serde_json::from_str(&res.expect("actual response"))
-            .expect("actual response deserialization");
-        assert_eq!(expected, result);
+        let json: Value = serde_json::from_str(&res.unwrap()).unwrap();
+        let error = &json["error"];
+        assert_eq!(error["code"], ErrorCode::InvalidParams.code());
     }
 
     #[test]
@@ -2661,7 +2664,7 @@ pub mod tests {
         let bad_pubkey = "a1b2c3d4";
         assert_eq!(
             verify_pubkey(bad_pubkey.to_string()),
-            Err(Error::invalid_request())
+            Err(Error::invalid_params("WrongSize"))
         );
     }
 
@@ -2675,7 +2678,7 @@ pub mod tests {
         let bad_signature = "a1b2c3d4";
         assert_eq!(
             verify_signature(&bad_signature.to_string()),
-            Err(Error::invalid_request())
+            Err(Error::invalid_params("WrongSize"))
         );
     }
 
diff --git a/core/tests/rpc.rs b/core/tests/rpc.rs
index 617dc0e18e..3ffa0e6077 100644
--- a/core/tests/rpc.rs
+++ b/core/tests/rpc.rs
@@ -120,14 +120,14 @@ fn test_rpc_invalid_requests() {
     let json = post_rpc(req, &leader_data);
 
     let the_error = json["error"]["message"].as_str().unwrap();
-    assert_eq!(the_error, "Invalid request");
+    assert_eq!(the_error, "Invalid");
 
     // test invalid get_account_info request
     let req = json_req!("getAccountInfo", json!(["invalid9999"]));
     let json = post_rpc(req, &leader_data);
 
     let the_error = json["error"]["message"].as_str().unwrap();
-    assert_eq!(the_error, "Invalid request");
+    assert_eq!(the_error, "Invalid");
 
     // test invalid get_account_info request
     let req = json_req!("getAccountInfo", json!([bob_pubkey.to_string()]));