Change response of Client to directly return Result

Author: thomaseizinger

examples/hello_world.rs

@@ -4,7 +4,7 @@ use jsonrpc::*;
 
 /// A trait defining the API you want to talk to. Not strictly necessary but nice for mocking.
 trait HelloWorldApi {
-    fn say_hello(&self, to: &str) -> Result<RpcResponse<String>, HTTPError>;
+    fn say_hello(&self, to: &str) -> Result<Result<String, RpcError>, HTTPError>;
 }
 
 /// An actual implementation of your client
@@ -13,7 +13,7 @@ struct HelloWorld {
 }
 
 impl HelloWorldApi for HelloWorld {
-    fn say_hello(&self, to: &str) -> Result<RpcResponse<String>, HTTPError> {
+    fn say_hello(&self, to: &str) -> Result<Result<String, RpcError>, HTTPError> {
         self.client.send(&RpcRequest::new1(
             JsonRpcVersion::V1,
             "test",
@@ -31,7 +31,6 @@ fn main() {
     let result = api_client
         .say_hello("World")
         .unwrap() // Handle network error
-        .into_result()
         .unwrap(); // Handle RpcError
 
     println!("{}", result);

src/client.rs

@@ -3,6 +3,7 @@ use reqwest::{Client as HTTPClient, Error};
 use response::RpcResponse;
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
+use RpcError;
 
 pub struct RpcClient {
     client: HTTPClient,
@@ -17,20 +18,26 @@ impl RpcClient {
         }
     }
 
-    pub fn send<R: Debug, T: Debug>(&self, request: &RpcRequest<T>) -> Result<RpcResponse<R>, Error>
+    pub fn send<R: Debug, T: Debug>(
+        &self,
+        request: &RpcRequest<T>,
+    ) -> Result<Result<R, RpcError>, Error>
     where
         T: Serialize,
         R: DeserializeOwned,
     {
         debug!("Request: {:?}", request);
+
         let res = self
             .client
             .post(self.url.as_str())
             .json(request)
             .send()
             .and_then(|mut res| res.json::<RpcResponse<R>>());
+
         debug!("Response: {:?}", res);
-        res
+
+        res.map(RpcResponse::into_result)
 
         // TODO: Maybe check if req.id == res.id. Should always hold since it is a synchronous call.
     }

src/version.rs

@@ -2,7 +2,7 @@
 pub enum JsonRpcVersion {
     #[serde(rename = "1.0")]
     V1,
-
-    #[serde(rename = "2.0")]
-    V2,
+    // At the moment, only version 1 is supported.
+    //    #[serde(rename = "2.0")]
+    //    V2,
 }