grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use new json RPC server

Browse Source
This commit is contained in:
arkpar
2016-04-07 14:24:52 +02:00
parent 8e64379ed4
commit 8074fee28c
4 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
parity/main.rs
View File

@@ -43,7 +43,6 @@ extern crate rpassword;
#[cfg(feature = "rpc")]
extern crate ethcore_rpc as rpc;
use std::any::Any;
use std::io::{BufRead, BufReader};
use std::fs::File;
use std::net::{SocketAddr, IpAddr};
@@ -64,6 +63,8 @@ use ethminer::{Miner, MinerService};
use docopt::Docopt;
use daemonize::Daemonize;
use number_prefix::{binary_prefix, Standalone, Prefixed};
#[cfg(feature = "rpc")]
use rpc::Server as RpcServer;
mod price_info;
@@ -271,10 +272,10 @@ fn setup_rpc_server(
sync: Arc<EthSync>,
secret_store: Arc<AccountService>,
miner: Arc<Miner>,
url: &str,
url: &SocketAddr,
cors_domain: &str,
apis: Vec<&str>
) -> Box<Any> {
) -> RpcServer {
use rpc::v1::*;
let server = rpc::RpcServer::new();
@@ -292,14 +293,17 @@ fn setup_rpc_server(
}
}
}
let start_result = server.start_http(url, cors_domain, ::num_cpus::get());
let start_result = server.start_http(url, cors_domain);
match start_result {
Err(rpc::RpcServerError::IoError(err)) => die_with_io_error(err),
Err(e) => die!("{:?}", e),
Ok(handle) => Box::new(handle),
Ok(server) => server,
}
}
#[cfg(not(feature = "rpc"))]
struct RpcServer;
#[cfg(not(feature = "rpc"))]
fn setup_rpc_server(
_client: Arc<Client>,
@@ -601,7 +605,7 @@ impl Configuration {
},
self.args.flag_rpcport.unwrap_or(self.args.flag_jsonrpc_port)
);
SocketAddr::from_str(&url).unwrap_or_else(|_| die!("{}: Invalid JSONRPC listen host/port given.", url));
let addr = SocketAddr::from_str(&url).unwrap_or_else(|_| die!("{}: Invalid JSONRPC listen host/port given.", url));
let cors_domain = self.args.flag_rpccorsdomain.as_ref().unwrap_or(&self.args.flag_jsonrpc_cors);
Some(setup_rpc_server(
@@ -609,7 +613,7 @@ impl Configuration {
sync.clone(),
account_service.clone(),
miner.clone(),
&url,
&addr,
&cors_domain,
apis.split(',').collect()
))
@@ -631,7 +635,7 @@ impl Configuration {
}
}
fn wait_for_exit(panic_handler: Arc<PanicHandler>, _rpc_server: Option<Box<Any>>) {
fn wait_for_exit(panic_handler: Arc<PanicHandler>, _rpc_server: Option<RpcServer>) {
let exit = Arc::new(Condvar::new());
// Handle possible exits