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

Disabling rpc until we switch to async hyper

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-04-07 16:22:02 +02:00
parent bf4ab6daa8
commit b7c790d741
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -319,7 +319,7 @@ dependencies = [
"hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-http-server 4.0.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git)", "jsonrpc-http-server 5.0.0 (git+https://github.com/debris/jsonrpc-http-server.git)",
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-status 0.1.1 (git+https://github.com/tomusdrw/parity-status.git)", "parity-status 0.1.1 (git+https://github.com/tomusdrw/parity-status.git)",
"parity-wallet 0.1.0 (git+https://github.com/tomusdrw/parity-wallet.git)", "parity-wallet 0.1.0 (git+https://github.com/tomusdrw/parity-wallet.git)",

6
parity/main.rs
View File

@ -67,7 +67,7 @@ use daemonize::Daemonize;
use number_prefix::{binary_prefix, Standalone, Prefixed}; use number_prefix::{binary_prefix, Standalone, Prefixed};
#[cfg(feature = "rpc")] #[cfg(feature = "rpc")]
use rpc::Server as RpcServer; use rpc::Server as RpcServer;
use webapp::WebappServer; use webapp::Listening as WebappServer;
mod price_info; mod price_info;
@ -324,7 +324,7 @@ fn setup_webapp_server(
) -> WebappServer { ) -> WebappServer {
use rpc::v1::*; use rpc::v1::*;
let server = WebappServer::new(); let server = webapp::WebappServer::new();
server.add_delegate(Web3Client::new().to_delegate()); server.add_delegate(Web3Client::new().to_delegate());
server.add_delegate(NetClient::new(&sync).to_delegate()); server.add_delegate(NetClient::new(&sync).to_delegate());
server.add_delegate(EthClient::new(&client, &sync, &secret_store, &miner).to_delegate()); server.add_delegate(EthClient::new(&client, &sync, &secret_store, &miner).to_delegate());
@ -334,7 +334,7 @@ fn setup_webapp_server(
match start_result { match start_result {
Err(webapp::WebappServerError::IoError(err)) => die_with_io_error(err), Err(webapp::WebappServerError::IoError(err)) => die_with_io_error(err),
Err(e) => die!("{:?}", e), Err(e) => die!("{:?}", e),
Ok(handle) => Box::new(handle), Ok(handle) => handle,
} }
} }

2
webapp/Cargo.toml
View File

@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
[dependencies] [dependencies]
log = "0.3" log = "0.3"
jsonrpc-core = "2.0" jsonrpc-core = "2.0"
jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git" } jsonrpc-http-server = { git = "https://github.com/debris/jsonrpc-http-server.git" }
hyper = { version = "0.8", default-features = false } hyper = { version = "0.8", default-features = false }
iron = { version = "0.3" } iron = { version = "0.3" }
ethcore-rpc = { path = "../rpc" } ethcore-rpc = { path = "../rpc" }

2
webapp/src/router/mod.rs
View File

@ -36,7 +36,7 @@ impl hyper::server::Handler for Router {
self.pages.get(url).unwrap().handle(req, res); self.pages.get(url).unwrap().handle(req, res);
} }
_ if req.method == hyper::method::Method::Post => { _ if req.method == hyper::method::Method::Post => {
self.rpc.handle(req, res) // self.rpc.handle(req, res)
}, },
_ => self.main_page.handle(req, res), _ => self.main_page.handle(req, res),
} }