Implement the errors of chain_sendSignedParcel method

This patch also reassigns the error code for UNKNOWN_ERROR.

Author: joojis

rpc/src/v1/errors.rs

@@ -18,8 +18,10 @@ use std::fmt;
 
 use ccore::AccountProviderError;
 use ccore::Error as CoreError;
+use ckey::Error as KeyError;
 use cnetwork::control::Error as NetworkControlError;
 use cstate::StateError;
+use ctypes::parcel::Error as ParcelError;
 use kvdb::Error as KVDBError;
 use rlp::DecoderError;
 
@@ -28,13 +30,20 @@ use jsonrpc_core::{Error, ErrorCode, Value};
 mod codes {
     pub const NO_AUTHOR: i64 = -32002;
     pub const NO_WORK_REQUIRED: i64 = -32004;
-    pub const UNKNOWN_ERROR: i64 = -32009;
+    pub const RLP_ERROR: i64 = -32009;
     pub const CORE_ERROR: i64 = -32010;
     pub const KVDB_ERROR: i64 = -32011;
     pub const PARCEL_ERROR: i64 = -32012;
     pub const NETWORK_DISABLED: i64 = -32014;
     pub const NETWORK_CANNOT_DISCONNECT_NOT_CONNECTED_ERROR: i64 = -32015;
     pub const ACCOUNT_PROVIDER_ERROR: i64 = -32016;
+    pub const VERIFICATION_FAILED: i64 = -32030;
+    pub const ALREADY_IMPORTED: i64 = -32031;
+    pub const NOT_ENOUGH_BALANCE: i64 = -32032;
+    pub const TOO_LOW_FEE: i64 = -32033;
+    pub const TOO_CHEAP_TO_REPLACE: i64 = -32034;
+    pub const INVALID_NONCE: i64 = -32035;
+    pub const UNKNOWN_ERROR: i64 = -32099;
 }
 
 pub fn core<T: Into<CoreError>>(error: T) -> Error {
@@ -65,18 +74,60 @@ pub fn parcel_state<T: Into<StateError>>(error: T) -> Error {
 
 pub fn parcel_core<T: Into<CoreError>>(error: T) -> Error {
     let error = error.into();
-    if let CoreError::State(StateError::Parcel(e)) = error {
-        Error {
-            code: ErrorCode::ServerError(codes::PARCEL_ERROR),
-            message: format!("{}", e),
-            data: None,
-        }
-    } else {
-        Error {
-            code: ErrorCode::ServerError(codes::UNKNOWN_ERROR),
-            message: "Unknown error when sending parcel.".into(),
-            data: Some(Value::String(format!("{:?}", error))),
-        }
+    let unknown_error = Error {
+        code: ErrorCode::ServerError(codes::UNKNOWN_ERROR),
+        message: "Unknown error when sending parcel.".into(),
+        data: Some(Value::String(format!("{:?}", error))),
+    };
+    match error {
+        CoreError::Key(error) => match error {
+            KeyError::InvalidSignature => Error {
+                code: ErrorCode::ServerError(codes::VERIFICATION_FAILED),
+                message: "Verification Failed".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            _ => unknown_error,
+        },
+        CoreError::State(StateError::Parcel(error)) => match error {
+            ParcelError::InvalidSignature(_) | ParcelError::InvalidNetworkId => Error {
+                code: ErrorCode::ServerError(codes::VERIFICATION_FAILED),
+                message: "Verification Failed".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            ParcelError::ParcelAlreadyImported => Error {
+                code: ErrorCode::ServerError(codes::ALREADY_IMPORTED),
+                message: "Already Imported".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            ParcelError::InsufficientBalance {
+                ..
+            } => Error {
+                code: ErrorCode::ServerError(codes::NOT_ENOUGH_BALANCE),
+                message: "Not Enough Balance".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            ParcelError::InsufficientFee {
+                ..
+            } => Error {
+                code: ErrorCode::ServerError(codes::TOO_LOW_FEE),
+                message: "Too Low Fee".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            ParcelError::TooCheapToReplace => Error {
+                code: ErrorCode::ServerError(codes::TOO_CHEAP_TO_REPLACE),
+                message: "Too Cheap to Replace".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            ParcelError::Old {
+                ..
+            } => Error {
+                code: ErrorCode::ServerError(codes::INVALID_NONCE),
+                message: "Invalid Nonce".into(),
+                data: Some(Value::String(format!("{:?}", error))),
+            },
+            _ => unknown_error,
+        },
+        _ => unknown_error,
     }
 }
 
@@ -90,7 +141,7 @@ pub fn kvdb(error: KVDBError) -> Error {
 
 pub fn rlp(error: DecoderError) -> Error {
     Error {
-        code: ErrorCode::ServerError(codes::UNKNOWN_ERROR),
+        code: ErrorCode::ServerError(codes::RLP_ERROR),
         message: "Invalid RLP.".into(),
         data: Some(Value::String(format!("{:?}", error))),
     }

spec/JSON-RPC.md

@@ -128,6 +128,7 @@ A base32 string that starts with "ccc" or "tcc". See [the specification](https:/
 | -32042 | `Already Exists` | The account already exists |
 | -32043 | `Wrong Password` | The password does not match |
 | -32044 | `No Such Account` | There is no such account in the key store |
+| -32099 | `Unknown Error` | An unknown error occurred |
 | -32602 | `Invalid Params` | At least one of the parameters is invalid |
 
 # List of methods