Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Upgrade to jsonrpc v14 (#11151)
Browse files Browse the repository at this point in the history
* Upgrade to jsonrpc v14

Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.

* Bump tokio & futures.

* Bump even further.

* Upgrade tokio to 0.1.22

* Partially revert "Bump tokio & futures."

This reverts commit 100907e.
  • Loading branch information
dvdplm authored and niklasad1 committed Nov 6, 2019
1 parent 59bcb13 commit 6f2f1db
Show file tree
Hide file tree
Showing 11 changed files with 186 additions and 157 deletions.
300 changes: 161 additions & 139 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ serde_derive = "1.0"
futures = "0.1"
fdlimit = "0.1"
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
jsonrpc-core = "12.0.0"
jsonrpc-core = "14.0.0"
parity-bytes = "0.1"
common-types = { path = "ethcore/types" }
ethcore = { path = "ethcore", features = ["parity"] }
Expand Down
4 changes: 2 additions & 2 deletions cli-signer/rpc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ serde_json = "1.0"
url = "1.2.0"
matches = "0.1"
parking_lot = "0.7"
jsonrpc-core = "12.0.0"
jsonrpc-ws-server = "12.0.0"
jsonrpc-core = "14.0.0"
jsonrpc-ws-server = "14.0.0"
parity-rpc = { path = "../../rpc" }
keccak-hash = "0.2.0"
4 changes: 2 additions & 2 deletions ipfs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ authors = ["Parity Technologies <[email protected]>"]
ethcore = { path = "../ethcore" }
parity-bytes = "0.1"
ethereum-types = "0.6.0"
jsonrpc-core = "12.0.0"
jsonrpc-http-server = "12.0.0"
jsonrpc-core = "14.0.0"
jsonrpc-http-server = "14.0.0"
rlp = "0.4.0"
cid = "0.3"
multihash = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions miner/stratum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ authors = ["Parity Technologies <[email protected]>"]
[dependencies]
ethereum-types = "0.6.0"
keccak-hash = "0.2.0"
jsonrpc-core = "12.0.0"
jsonrpc-tcp-server = "12.0.0"
jsonrpc-core = "14.0.0"
jsonrpc-tcp-server = "14.0.0"
log = "0.4"
parking_lot = "0.7"

Expand Down
7 changes: 7 additions & 0 deletions miner/stratum/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -470,4 +470,11 @@ mod tests {
"{ \"id\": 17, \"method\": \"mining.notify\", \"params\": { \"00040008\", \"100500\" } }\n",
response);
}

#[test]
fn jsonprc_server_is_send_and_sync() {
fn is_send_and_sync<T: Send + Sync>() {}

is_send_and_sync::<JsonRpcServer>();
}
}
2 changes: 1 addition & 1 deletion parity-clib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = "0.1.6"
jni = { version = "0.11", optional = true }
panic_hook = { path = "../util/panic-hook" }
parity-ethereum = { path = "../", default-features = false }
tokio = "0.1.11"
tokio = "0.1.22"
tokio-current-thread = "0.1.3"

[features]
Expand Down
12 changes: 6 additions & 6 deletions rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ tokio-timer = "0.1"
transient-hashmap = "0.4"
itertools = "0.5"

jsonrpc-core = "12.0.0"
jsonrpc-derive = "12.0.0"
jsonrpc-http-server = "12.0.0"
jsonrpc-ws-server = "12.0.0"
jsonrpc-ipc-server = "12.0.0"
jsonrpc-pubsub = "12.0.0"
jsonrpc-core = "14.0.0"
jsonrpc-derive = "14.0.0"
jsonrpc-http-server = "14.0.0"
jsonrpc-ws-server = "14.0.0"
jsonrpc-ipc-server = "14.0.0"
jsonrpc-pubsub = "14.0.0"

common-types = { path = "../ethcore/types" }
ethash = { path = "../ethash" }
Expand Down
4 changes: 2 additions & 2 deletions secret-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
tiny-keccak = "1.4"
tokio = "~0.1.11"
tokio = "0.1.22"
tokio-io = "0.1"
tokio-service = "0.1"
url = "1.0"
jsonrpc-server-utils = "12.0.0"
jsonrpc-server-utils = "14.0.0"

[dev-dependencies]
env_logger = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion util/fetch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hyper = "~0.12.9"
hyper-rustls = "0.16.0"
http = "0.1"
log = "0.4"
tokio = "~0.1.8"
tokio = "0.1.22"
url = "1"
bytes = "0.4"

Expand Down
2 changes: 1 addition & 1 deletion util/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ authors = ["Parity Technologies <[email protected]>"]

[dependencies]
futures = "0.1"
tokio = "~0.1.9"
tokio = "0.1.22"

0 comments on commit 6f2f1db

Please sign in to comment.