Using ethcore http server

This commit is contained in:
Tomasz Drwięga 2016-06-01 18:00:40 +02:00
parent 1fd9110829
commit 4742860b2e
3 changed files with 7 additions and 5 deletions

5
Cargo.lock generated
View File

@ -270,7 +270,7 @@ dependencies = [
"ethcore-util 1.2.0", "ethcore-util 1.2.0",
"hyper 0.9.3 (git+https://github.com/ethcore/hyper)", "hyper 0.9.3 (git+https://github.com/ethcore/hyper)",
"jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)", "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",
"jsonrpc-http-server 5.1.0", "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-dapps-rs.git)", "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-dapps-rs.git)",
"parity-dapps-builtins 0.5.0 (git+https://github.com/ethcore/parity-dapps-builtins-rs.git)", "parity-dapps-builtins 0.5.0 (git+https://github.com/ethcore/parity-dapps-builtins-rs.git)",
@ -338,7 +338,7 @@ dependencies = [
"ethsync 1.2.0", "ethsync 1.2.0",
"json-ipc-server 0.1.0 (git+https://github.com/tomusdrw/json-ipc-server.git)", "json-ipc-server 0.1.0 (git+https://github.com/tomusdrw/json-ipc-server.git)",
"jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)", "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",
"jsonrpc-http-server 5.1.0", "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -604,6 +604,7 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-http-server" name = "jsonrpc-http-server"
version = "5.1.0" version = "5.1.0"
source = "git+https://github.com/ethcore/jsonrpc-http-server.git#7a4f322a31834737c8f007b00e7d376f7dc07cdb"
dependencies = [ dependencies = [
"hyper 0.9.3 (git+https://github.com/ethcore/hyper)", "hyper 0.9.3 (git+https://github.com/ethcore/hyper)",
"jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)", "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",

View File

@ -11,7 +11,8 @@ build = "build.rs"
[dependencies] [dependencies]
log = "0.3" log = "0.3"
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" } jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" } # jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
hyper = { default-features = false, git = "https://github.com/ethcore/hyper" } hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
url = "1.0" url = "1.0"
rustc-serialize = "0.3" rustc-serialize = "0.3"

View File

@ -13,8 +13,8 @@ log = "0.3"
serde = "0.7.0" serde = "0.7.0"
serde_json = "0.7.0" serde_json = "0.7.0"
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" } jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
# jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git", branch = "multiple_cors_domains" } jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" } # jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
ethcore-util = { path = "../util" } ethcore-util = { path = "../util" }
ethcore = { path = "../ethcore" } ethcore = { path = "../ethcore" }
ethash = { path = "../ethash" } ethash = { path = "../ethash" }