updated jsonrpc-core and http-server libs

rpc/Cargo.toml

@@ -12,8 +12,8 @@ build = "build.rs"
 log = "0.3"
 serde = "0.7.0"
 serde_json = "0.7.0"
-jsonrpc-core = "1.2"
-jsonrpc-http-server = "2.1"
+jsonrpc-core = "2.0"
+jsonrpc-http-server = "3.0"
 ethcore-util = { path = "../util" }
 ethcore = { path = "../ethcore" }
 ethash = { path = "../ethash" }

rpc/src/lib.rs

@@ -37,35 +37,33 @@ use self::jsonrpc_core::{IoHandler, IoDelegate};
 pub mod v1;
 
 /// Http server.
-pub struct HttpServer {
-	handler: IoHandler,
-	threads: usize,
+pub struct RpcServer {
+	handler: Arc<IoHandler>,
 }
 
-impl HttpServer {
+impl RpcServer {
 	/// Construct new http server object with given number of threads.
-	pub fn new(threads: usize) -> HttpServer {
-		HttpServer {
-			handler: IoHandler::new(),
-			threads: threads,
+	pub fn new() -> RpcServer {
+		RpcServer {
+			handler: Arc::new(IoHandler::new()),
 		}
 	}
 
 	/// Add io delegate.
-	pub fn add_delegate<D>(&mut self, delegate: IoDelegate<D>) where D: Send + Sync + 'static {
+	pub fn add_delegate<D>(&self, delegate: IoDelegate<D>) where D: Send + Sync + 'static {
 		self.handler.add_delegate(delegate);
 	}
 
 	/// Start server asynchronously in new thread and returns panic handler.
-	pub fn start_async(self, addr: &str, cors_domain: &str) -> Arc<PanicHandler> {
+	pub fn start_http(&self, addr: &str, cors_domain: &str, threads: usize) -> Arc<PanicHandler> {
 		let addr = addr.to_owned();
 		let cors_domain = cors_domain.to_owned();
 		let panic_handler = PanicHandler::new_in_arc();
 		let ph = panic_handler.clone();
-		let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
+		let server = jsonrpc_http_server::Server::new(self.handler.clone());
 		thread::Builder::new().name("jsonrpc_http".to_string()).spawn(move || {
 			ph.catch_panic(move || {
-				server.start(addr.as_ref(), jsonrpc_http_server::AccessControlAllowOrigin::Value(cors_domain));
+				server.start(addr.as_ref(), jsonrpc_http_server::AccessControlAllowOrigin::Value(cors_domain), threads);
 			}).unwrap()
 		}).expect("Error while creating jsonrpc http thread");
 		panic_handler