cleanup ethrpc

This commit is contained in:
debris 2016-01-20 15:49:49 +01:00
parent 47e28672b6
commit a8e4912551
2 changed files with 57 additions and 21 deletions

View File

@ -5,17 +5,56 @@ use std::sync::{Arc, RwLock};
use self::jsonrpc_core::{IoHandler, IoDelegate, Params, Value, Error, ErrorCode}; use self::jsonrpc_core::{IoHandler, IoDelegate, Params, Value, Error, ErrorCode};
use ethcore::client::*; use ethcore::client::*;
struct Eth { macro_rules! rpcerr {
client: Arc<RwLock<Client>> () => (Err(Error::new(ErrorCode::InternalError)))
} }
impl Eth { /// This could be a part of `jsonrpc_core`. Unfortunately,
fn new(client: Arc<RwLock<Client>>) -> Self { /// "only traits defined in the current crate can be implemented for a type parameter".
Eth { pub trait IntoDelegate<T> where T: Send + Sync + 'static {
/// This function should be called to translate custom type into IoDelegate
fn into_delegate(self) -> IoDelegate<T>;
}
/// eth rpc interface
pub trait Eth {
/// returns protocol version
fn protocol_version(&self, _: Params) -> Result<Value, Error> { rpcerr!() }
/// returns block author
fn author(&self, _: Params) -> Result<Value, Error> { rpcerr!() }
/// returns current gas_price
fn gas_price(&self, _: Params) -> Result<Value, Error> { rpcerr!() }
/// returns highest block number
fn block_number(&self, _: Params) -> Result<Value, Error> { rpcerr!() }
}
impl<D> IntoDelegate<D> for D where D: Eth + Send + Sync + 'static {
fn into_delegate(self) -> IoDelegate<D> {
let mut delegate = IoDelegate::new(Arc::new(self));
delegate.add_method("eth_protocolVersion", D::protocol_version);
delegate.add_method("eth_coinbase", D::author);
delegate.add_method("eth_gasPrice", D::gas_price);
delegate.add_method("eth_blockNumber", D::block_number);
delegate
}
}
pub struct EthClient {
client: Arc<RwLock<Client>>,
}
impl EthClient {
pub fn new(client: Arc<RwLock<Client>>) -> Self {
EthClient {
client: client client: client
} }
} }
}
impl Eth for EthClient {
fn block_number(&self, params: Params) -> Result<Value, Error> { fn block_number(&self, params: Params) -> Result<Value, Error> {
match params { match params {
Params::None => Ok(Value::U64(self.client.read().unwrap().chain_info().best_block_number)), Params::None => Ok(Value::U64(self.client.read().unwrap().chain_info().best_block_number)),
@ -24,30 +63,26 @@ impl Eth {
} }
} }
struct EthRpc;
impl EthRpc {
fn build_handler(client: Arc<RwLock<Client>>) -> IoHandler {
let mut handler = IoHandler::new();
let mut eth = IoDelegate::new(Arc::new(Eth::new(client)));
eth.add_method("eth_blockNumber", Eth::block_number);
handler.add_delegate(eth);
handler
}
}
pub struct HttpServer { pub struct HttpServer {
server: jsonrpc_http_server::Server handler: IoHandler,
threads: usize
} }
impl HttpServer { impl HttpServer {
pub fn new(client: Arc<RwLock<Client>>, threads: usize) -> HttpServer { pub fn new(threads: usize) -> HttpServer {
HttpServer { HttpServer {
server: jsonrpc_http_server::Server::new(EthRpc::build_handler(client), threads) handler: IoHandler::new(),
threads: threads
} }
} }
pub fn add_delegate<I, D>(&mut self, delegate: I) where D: Send + Sync + 'static, I: IntoDelegate<D> {
self.handler.add_delegate(delegate.into_delegate());
}
pub fn start_async(self, addr: &str) { pub fn start_async(self, addr: &str) {
self.server.start_async(addr) let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
server.start_async(addr)
} }
} }

View File

@ -32,7 +32,8 @@ fn setup_log() {
#[cfg(feature = "rpc")] #[cfg(feature = "rpc")]
fn setup_rpc_server(client: Arc<RwLock<Client>>) { fn setup_rpc_server(client: Arc<RwLock<Client>>) {
let server = ethrpc::HttpServer::new(client, 1); let mut server = ethrpc::HttpServer::new(1);
server.add_delegate(ethrpc::EthClient::new(client));
server.start_async("127.0.0.1:3030"); server.start_async("127.0.0.1:3030");
} }