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

Reverting back to old-hyper version of rpc

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

12
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 5.0.0 (git+https://github.com/debris/jsonrpc-http-server.git)", "jsonrpc-http-server 4.0.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git?branch=old-hyper)",
"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)",
@ -524,6 +524,16 @@ dependencies = [
"syntex 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "jsonrpc-http-server"
version = "4.0.0"
source = "git+https://github.com/tomusdrw/jsonrpc-http-server.git?branch=old-hyper#46bd4e7cf8352e0efc940cf76d3dff99f1a3da15"
dependencies = [
"hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "jsonrpc-http-server" name = "jsonrpc-http-server"
version = "5.0.0" version = "5.0.0"

1
parity/main.rs
View File

@ -67,6 +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;
#[cfg(feature = "webapp")]
use webapp::Listening as WebappServer; use webapp::Listening as WebappServer;
mod price_info; mod price_info;

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/debris/jsonrpc-http-server.git" } jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git", branch="old-hyper" }
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),
} }