Merge branch 'simplify-response-check'

Author: faern

core/src/response.rs

@@ -19,29 +19,22 @@ where
 {
     let response: Output = serde_json::from_slice(response_raw)
         .chain_err(|| ErrorKind::ResponseError("Not valid json"))?;
+    ensure!(
+        response.version() == Some(Version::V2),
+        ErrorKind::ResponseError("Not JSON-RPC 2.0 compatible")
+    );
+    ensure!(
+        response.id() == &expected_id,
+        ErrorKind::ResponseError("Response id not equal to request id")
+    );
     match response {
         Output::Success(success) => {
-            check_response(success.jsonrpc, success.id, expected_id)?;
             trace!("Received json result: {}", success.result);
             serde_json::from_value::<R>(success.result)
                 .chain_err(|| ErrorKind::ResponseError("Not valid for target type"))
         }
         Output::Failure(failure) => {
-            check_response(failure.jsonrpc, failure.id, expected_id)?;
             Err(ErrorKind::JsonRpcError(failure.error).into())
         }
     }
 }
-
-/// Validate if response is a valid JSON-RPC 2.0 response object with the correct Id.
-fn check_response(version: Option<Version>, id: Id, expected_id: Id) -> Result<()> {
-    ensure!(
-        version == Some(Version::V2),
-        ErrorKind::ResponseError("Not JSON-RPC 2.0 compatible")
-    );
-    ensure!(
-        id == expected_id,
-        ErrorKind::ResponseError("Response id not equal to request id")
-    );
-    Ok(())
-}

http/Cargo.toml

@@ -25,7 +25,6 @@ default = ["tls"]
 tls = ["hyper-tls", "native-tls"]
 
 [dev-dependencies]
-env_logger = "0.5"
 jsonrpc-core = "8.0"
 jsonrpc-macros = "8.0"
 jsonrpc-http-server = "8.0"

http/tests/localhost.rs

@@ -6,7 +6,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate env_logger;
 extern crate futures;
 #[macro_use]
 extern crate jsonrpc_client_core;
@@ -48,8 +47,6 @@ jsonrpc_client!(pub struct TestClient {
 
 #[test]
 fn localhost_ping_pong() {
-    let _ = env_logger::init();
-
     // Spawn a server hosting the `ServerApi` API.
     let (_server, uri) = spawn_server();
     println!("Testing towards server at {}", uri);
@@ -79,8 +76,6 @@ fn localhost_ping_pong() {
 
 #[test]
 fn dropped_rpc_request_should_not_crash_transport() {
-    let _ = env_logger::init();
-
     let (_server, uri) = spawn_server();
 
     let mut core = Core::new().unwrap();