Merge remote-tracking branch 'upstream/master' into await-InBlock

Author: developerfred

src/rpc/client.rs

@@ -96,7 +96,7 @@ pub fn on_extrinsic_msg_until_finalized(
     debug!("got msg {}", retstr);
     match parse_status(retstr) {
         (XtStatus::Finalized, val) => end_process(out, result, val),
-        (XtStatus::Error, _) => end_process(out, result, None),
+        (XtStatus::Error, e) => end_process(out, result, e),
         (XtStatus::Future, _) => {
             warn!("extrinsic has 'future' status. aborting");
             end_process(out, result, None);
@@ -119,15 +119,20 @@ pub fn on_extrinsic_msg_until_ready(
         (XtStatus::InBlock, _) => end_process(out, result, None),
         (XtStatus::Broadcast, _) => end_process(out, result, None),
         (XtStatus::Future, _) => end_process(out, result, None),
-        (XtStatus::Error, _) => end_process(out, result, None),
+        (XtStatus::Error, e) => end_process(out, result, e),
         _ => (),
     };
     Ok(())
 }
 
 fn end_process(out: Sender, result: ThreadOut<String>, value: Option<String>) {
     // return result to calling thread
-    let val = value.unwrap_or_else(|| "nix".to_string());
+    debug!(
+        "Thread end result :{:?} value:{:?}",
+        result.clone(),
+        value.clone()
+    );
+    let val = value.unwrap();
     result.send(val).unwrap();
     out.close(CloseCode::Normal).unwrap();
 }
@@ -136,12 +141,13 @@ fn parse_status(msg: &str) -> (XtStatus, Option<String>) {
     let value: serde_json::Value = serde_json::from_str(msg).unwrap();
     match value["error"].as_object() {
         Some(obj) => {
+            let error_message = obj.get("message").unwrap().as_str().unwrap().to_owned();
             error!(
                 "extrinsic error code {}: {}",
                 obj.get("code").unwrap().as_u64().unwrap(),
-                obj.get("message").unwrap().as_str().unwrap()
+                error_message.clone()
             );
-            (XtStatus::Error, None)
+            (XtStatus::Error, Some(error_message))
         }
         None => match value["params"]["result"].as_object() {
             Some(obj) => {
@@ -209,12 +215,15 @@ mod tests {
         );
 
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32700,\"message\":\"Parse error\"},\"id\":null}";
-        assert_eq!(parse_status(msg), (XtStatus::Error, None));
+        assert_eq!(parse_status(msg), (XtStatus::Error, Some("Parse error".into())));
 
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":1010,\"message\":\"Invalid Transaction\",\"data\":0},\"id\":\"4\"}";
-        assert_eq!(parse_status(msg), (XtStatus::Error, None));
+        assert_eq!(parse_status(msg), (XtStatus::Error, Some("Invalid Transaction".into())));
 
         let msg = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":1001,\"message\":\"Extrinsic has invalid format.\"},\"id\":\"0\"}";
-        assert_eq!(parse_status(msg), (XtStatus::Error, None));
+        assert_eq!(parse_status(msg), (XtStatus::Error, Some("Extrinsic has invalid format.".into())));
+
+        let msg = r#"{"jsonrpc":"2.0","error":{"code":1002,"message":"Verification Error: Execution(Wasmi(Trap(Trap { kind: Unreachable })))","data":"RuntimeApi(\"Execution(Wasmi(Trap(Trap { kind: Unreachable })))\")"},"id":"3"}"#;
+        assert_eq!(parse_status(msg), (XtStatus::Error, Some("Verification Error: Execution(Wasmi(Trap(Trap { kind: Unreachable })))".into())));
     }
 }