Upgrade jsonrpc versions to v14.0.0

Author: foriequal0

codechain/rpc.rs

@@ -19,9 +19,9 @@ use std::net::SocketAddr;
 
 use crate::rpc_apis;
 use crpc::{
- jsonrpc_core, start_http, start_ipc, start_ws, HttpServer, IpcServer, MetaIoHandler, Middleware, WsError,
- WsErrorKind, WsServer,
+ jsonrpc_core, start_http, start_ipc, start_ws, HttpServer, IpcServer, MetaIoHandler, Middleware, WsError, WsServer,
 };
+use futures::future::Either;
 use serde_json;
 
 #[derive(Debug, PartialEq)]
@@ -109,7 +109,7 @@ pub fn rpc_ws_start(
  let addr = url.parse().map_err(|_| format!("Invalid WebSockets listen host/port given: {}", url))?;
  let start_result = start_ws(&addr, server, cfg.max_connections);
  match start_result {
- Err(WsError(WsErrorKind::Io(ref err), _)) if err.kind() == io::ErrorKind::AddrInUse => {
+ Err(WsError::Io(ref err)) if err.kind() == io::ErrorKind::AddrInUse => {
  Err(format!("WebSockets address {} is already in use, make sure that another instance of a Codechain node is not running or change the address using the --ws-port options.", addr))
  },
  Err(e) => Err(format!("WebSockets error: {:?}", e)),
@@ -133,8 +133,9 @@ struct LogMiddleware {}
 
 impl<M: jsonrpc_core::Metadata> jsonrpc_core::Middleware<M> for LogMiddleware {
  type Future = jsonrpc_core::FutureResponse;
+ type CallFuture = jsonrpc_core::FutureOutput;
 
- fn on_request<F, X>(&self, request: jsonrpc_core::Request, meta: M, next: F) -> Self::Future
+ fn on_request<F, X>(&self, request: jsonrpc_core::Request, meta: M, next: F) -> Either<Self::Future, X>
  where
  F: FnOnce(jsonrpc_core::Request, M) -> X + Send,
  X: futures::Future<Item = Option<jsonrpc_core::Response>, Error = ()> + Send + 'static, {
@@ -146,7 +147,15 @@ impl<M: jsonrpc_core::Metadata> jsonrpc_core::Middleware<M> for LogMiddleware {
  }
  }
  }
- Box::new(next(request, meta))
+ Either::B(next(request, meta))
+ }
+
+ fn on_call<F, X>(&self, call: jsonrpc_core::Call, meta: M, next: F) -> Either<Self::CallFuture, X>
+ where
+ F: FnOnce(jsonrpc_core::Call, M) -> X + Send,
+ X: futures::Future<Item = Option<jsonrpc_core::Output>, Error = ()> + Send + 'static, {
+ Self::print_call(&call);
+ Either::B(next(call, meta))
  }
 }
 
@@ -166,7 +175,9 @@ impl LogMiddleware {
  );
  }
  jsonrpc_core::Call::Notification(_) => {}
- jsonrpc_core::Call::Invalid(_) => {}
+ jsonrpc_core::Call::Invalid {
+ ..
+ } => {}
  }
  }
 }

rpc/Cargo.toml

@@ -33,8 +33,8 @@ rustc-hex = "1.0"
 rustc-serialize = "0.3"
 time = "0.1"
 tokio-core = "0.1.17"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
-jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
-jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.0" }
+jsonrpc-derive = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.0" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.0" }
+jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.0" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.0" }

rpc/src/lib.rs

@@ -51,21 +51,20 @@ extern crate time;
 extern crate tokio_core;
 
 #[macro_use]
-extern crate jsonrpc_macros;
+extern crate jsonrpc_derive;
 
 pub mod rpc_server;
 pub mod v1;
 
 pub use rustc_serialize::hex;
 
 pub use jsonrpc_core::{Compatibility, Error, MetaIoHandler, Middleware, Params, Value};
-pub use jsonrpc_http_server::tokio_core::reactor::Remote;
 
 pub use jsonrpc_http_server::Server as HttpServer;
 pub use rpc_server::start_http;
 
 pub use jsonrpc_ipc_server::Server as IpcServer;
 pub use rpc_server::start_ipc;
 
-pub use jsonrpc_ws_server::{Error as WsError, ErrorKind as WsErrorKind, Server as WsServer};
+pub use jsonrpc_ws_server::{Error as WsError, Server as WsServer};
 pub use rpc_server::start_ws;

rpc/src/v1/traits/account.rs

@@ -20,34 +20,38 @@ use primitives::H256;
 
 use super::super::types::{SendTransactionResult, UnsignedTransaction};
 
-build_rpc_trait! {
- pub trait Account {
- /// Gets a list of accounts
- # [rpc(name = "account_getList")]
- fn get_account_list(&self) -> Result<Vec<PlatformAddress>>;
-
- /// Creates a new account
- # [rpc(name = "account_create")]
- fn create_account(&self, Option<Password>) -> Result<PlatformAddress>;
-
- /// Imports a private key
- # [rpc(name = "account_importRaw")]
- fn create_account_from_secret(&self, H256, Option<Password>) -> Result<PlatformAddress>;
-
- /// Unlocks the specified account for use.
- # [rpc(name = "account_unlock")]
- fn unlock(&self, PlatformAddress, Password, Option<u64>) -> Result<()>;
-
- /// Calculates the account's signature for a given message
- # [rpc(name = "account_sign")]
- fn sign(&self, H256, PlatformAddress, Option<Password>) -> Result<Signature>;
-
- /// Sends a transaction with a signature of the account
- # [rpc(name = "account_sendTransaction")]
- fn send_transaction(&self, UnsignedTransaction, PlatformAddress, Option<Password>) -> Result<SendTransactionResult>;
-
- /// Changes the account's password
- # [rpc(name = "account_changePassword")]
- fn change_password(&self, PlatformAddress, Password, Password) -> Result<()>;
- }
+#[rpc(server)]
+pub trait Account {
+ /// Gets a list of accounts
+ #[rpc(name = "account_getList")]
+ fn get_account_list(&self) -> Result<Vec<PlatformAddress>>;
+
+ /// Creates a new account
+ #[rpc(name = "account_create")]
+ fn create_account(&self, passphrase: Option<Password>) -> Result<PlatformAddress>;
+
+ /// Imports a private key
+ #[rpc(name = "account_importRaw")]
+ fn create_account_from_secret(&self, secret: H256, passphrase: Option<Password>) -> Result<PlatformAddress>;
+
+ /// Unlocks the specified account for use.
+ #[rpc(name = "account_unlock")]
+ fn unlock(&self, address: PlatformAddress, password: Password, duration: Option<u64>) -> Result<()>;
+
+ /// Calculates the account's signature for a given message
+ #[rpc(name = "account_sign")]
+ fn sign(&self, message_digest: H256, address: PlatformAddress, passphrase: Option<Password>) -> Result<Signature>;
+
+ /// Sends a transaction with a signature of the account
+ #[rpc(name = "account_sendTransaction")]
+ fn send_transaction(
+ &self,
+ tx: UnsignedTransaction,
+ platform_address: PlatformAddress,
+ passphrase: Option<Password>,
+ ) -> Result<SendTransactionResult>;
+
+ /// Changes the account's password
+ #[rpc(name = "account_changePassword")]
+ fn change_password(&self, address: PlatformAddress, old_password: Password, new_password: Password) -> Result<()>;
 }