Remove derive <-> core-client circular dependency (paritytech#419)

* Remove core-client <-> derive circular dev dependency

* Restore original derived cli/server test to derive crate

Author: ascjones

core-client/Cargo.toml

@@ -27,7 +27,6 @@ serde = "1.0"
 serde_json = "1.0"
 
 [dev-dependencies]
-jsonrpc-derive = { version = "11.0", path = "../derive" }
 serde = "1.0"
 tokio = "0.1"
 

core-client/src/lib.rs

@@ -364,24 +364,9 @@ pub mod local {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use jsonrpc_core::{IoHandler, Result};
-	use jsonrpc_derive::rpc;
+	use jsonrpc_core::{self, IoHandler};
 	use crate::{TypedClient, RpcError, RpcChannel};
 
-	#[rpc(server)]
-	pub trait Rpc {
-		#[rpc(name = "add")]
-		fn add(&self, a: u64, b: u64) -> Result<u64>;
-	}
-
-	struct RpcServer;
-
-	impl Rpc for RpcServer {
-		fn add(&self, a: u64, b: u64) -> Result<u64> {
-			Ok(a + b)
-		}
-	}
-
 	#[derive(Clone)]
 	struct AddClient(TypedClient);
 
@@ -400,7 +385,12 @@ mod tests {
 	#[test]
 	fn test_client_terminates() {
 		let mut handler = IoHandler::new();
-		handler.extend_with(RpcServer.to_delegate());
+		handler.add_method("add", |params: Params| {
+			let (a, b) = params.parse::<(u64, u64)>()?;
+			let res = a + b;
+			Ok(jsonrpc_core::to_value(res).unwrap())
+		});
+
 		let (client, rpc_client) = local::connect::<AddClient, _, _>(handler);
 		let fut = client
 			.clone()

derive/Cargo.toml

@@ -23,7 +23,9 @@ jsonrpc-core = { version = "11.0", path = "../core" }
 jsonrpc-core-client = { version = "11.0", path = "../core-client" }
 jsonrpc-pubsub = { version = "11.0", path = "../pubsub" }
 jsonrpc-tcp-server = { version = "11.0", path = "../tcp" }
+futures = "~0.1.6"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
+tokio = "0.1"
 compiletest_rs = { version = "0.3", features = ["stable"] }

derive/tests/client.rs

@@ -0,0 +1,38 @@
+use futures::prelude::*;
+use jsonrpc_core_client::local;
+use jsonrpc_core::{IoHandler, Result};
+use jsonrpc_derive::rpc;
+
+#[rpc]
+pub trait Rpc {
+	#[rpc(name = "add")]
+	fn add(&self, a: u64, b: u64) -> Result<u64>;
+}
+
+struct RpcServer;
+
+impl Rpc for RpcServer {
+	fn add(&self, a: u64, b: u64) -> Result<u64> {
+		Ok(a + b)
+	}
+}
+
+#[test]
+fn client_server_roundtrip() {
+	let mut handler = IoHandler::new();
+	handler.extend_with(RpcServer.to_delegate());
+	let (client, rpc_client) = local::connect::<gen_client::Client, _, _>(handler);
+	let fut = client
+		.clone()
+		.add(3, 4)
+		.and_then(move |res| client.add(res, 5))
+		.join(rpc_client)
+		.map(|(res, ())| {
+			assert_eq!(res, 12);
+		})
+		.map_err(|err| {
+			eprintln!("{:?}", err);
+			assert!(false);
+		});
+	tokio::run(fut);
+}