nits

Signed-off-by: Sam Batschelet <[email protected]>

Author: hexfusion

spacesvm/src/api/client.rs

@@ -28,7 +28,7 @@ use serde::de;
 pub use http::Uri;
 use tokio::sync::RwLock;
 
-/// HTTP client for interacting with the API.
+/// Thread safe HTTP client for interacting with the API.
 pub struct Client<C> {
     inner: Arc<RwLock<ClientInner<C>>>,
 }
@@ -73,18 +73,22 @@ impl Client<HttpConnector> {
     }
 
     /// Returns a serialized json request as string and the request id.
-    pub async fn raw_request(&self, method: &str, params: &Params) -> (Id, String) {
+    pub async fn raw_request(&self, method: &str, params: &Params) -> Result<(Id, String)> {
         let id = self.next_id().await;
         let request = jsonrpc_core::Request::Single(Call::MethodCall(MethodCall {
             jsonrpc: Some(Version::V2),
             method: method.to_owned(),
             params: params.to_owned(),
             id: id.clone(),
         }));
-        (
-            id,
-            serde_json::to_string(&request).expect("jsonrpc request should be serializable"),
-        )
+        let request = serde_json::to_string(&request).map_err(|e| {
+            Error::new(
+                ErrorKind::Other,
+                format!("jsonrpc request should be serializable: {}", e),
+            )
+        })?;
+
+        Ok((id, request))
     }
 
     /// Returns a recoverable signature from 32 byte SHA256 message.

tests/e2e/src/tests/mod.rs

@@ -217,7 +217,7 @@ async fn e2e() {
         .decode_tx(claim_tx("test"))
         .await
         .expect("decodeTx success");
-    log::info!("decode claim response from {}: {:?}", chain_url, resp);
+    log::info!("decode claim tx response from {}: {:?}", chain_url, resp);
 
     log::info!("issue claim tx request...");
     let resp = scli
@@ -231,14 +231,14 @@ async fn e2e() {
         .decode_tx(set_tx("test", "foo", "bar"))
         .await
         .expect("decodeTx success");
-    log::info!("decode set response from {}: {:?}", chain_url, resp);
+    log::info!("decode set tx response from {}: {:?}", chain_url, resp);
 
     log::info!("issue set tx request...");
     let resp = scli
         .issue_tx(&resp.typed_data)
         .await
         .expect("issue_tx success");
-    log::info!("issue tx tx response from {}: {:?}", chain_url, resp);
+    log::info!("issue set tx response from {}: {:?}", chain_url, resp);
 
     log::info!("issue resolve request...");
     let resp = scli.resolve("test", "foo").await.expect("resolve success");