Upgrade to jsonrpc v14 (openethereum#11151)

* 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.
zhyang0918 · Oct 10, 2019 · 9d313e3 · 9d313e3
1 parent 330cdc1
commit 9d313e3
Show file tree

Hide file tree

Showing 11 changed files with 178 additions and 146 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = "13.2.0"
+jsonrpc-core = "14.0.0"
 keccak-hash = "0.4.0"
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.5"

diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0"
 url = "2.1.0"
 matches = "0.1"
 parking_lot = "0.9"
-jsonrpc-core = "13.2.0"
-jsonrpc-ws-server = "13.2.0"
+jsonrpc-core = "14.0.0"
+jsonrpc-ws-server = "14.0.0"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.4.0"
diff --git a/ipfs/Cargo.toml b/ipfs/Cargo.toml
@@ -12,8 +12,8 @@ common-types = { path = "../ethcore/types" }
 ethcore = { path = "../ethcore" }
 bytes = { package = "parity-bytes", version = "0.1"}
 ethereum-types = "0.8.0"
-jsonrpc-core = "13.2.0"
-http = { package = "jsonrpc-http-server", version = "13.2.0"}
+jsonrpc-core = "14.0.0"
+http = { package = "jsonrpc-http-server", version = "14.0.0"}
 rlp = "0.4.0"
 cid = "0.3"
 multihash = "0.8"

diff --git a/miner/stratum/Cargo.toml b/miner/stratum/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 ethereum-types = "0.8.0"
 keccak-hash = "0.4.0"
-jsonrpc-core = "13.2.0"
-jsonrpc-tcp-server = "13.2.0"
+jsonrpc-core = "14.0.0"
+jsonrpc-tcp-server = "14.0.0"
 log = "0.4"
 parking_lot = "0.9"
 

diff --git a/miner/stratum/src/lib.rs b/miner/stratum/src/lib.rs
@@ -497,4 +497,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>();
+	}
 }
diff --git a/parity-clib/Cargo.toml b/parity-clib/Cargo.toml
@@ -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]

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -28,12 +28,12 @@ tokio-timer = "0.1"
 transient-hashmap = "0.4"
 itertools = "0.5"
 
-jsonrpc-core = "13.2.0"
-jsonrpc-derive = "13.2.0"
-jsonrpc-http-server = "13.2.0"
-jsonrpc-ws-server = "13.2.0"
-jsonrpc-ipc-server = "13.2.0"
-jsonrpc-pubsub = "13.2.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"
 
 client-traits = { path = "../ethcore/client-traits" }
 common-types = { path = "../ethcore/types" }

diff --git a/secret-store/Cargo.toml b/secret-store/Cargo.toml
@@ -35,11 +35,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 = "2.1.0"
-jsonrpc-server-utils = "13.2.0"
+jsonrpc-server-utils = "14.0.0"
 
 [dev-dependencies]
 env_logger = "0.5"

diff --git a/util/fetch/Cargo.toml b/util/fetch/Cargo.toml
@@ -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 = "2"
 bytes = "0.4"
 

diff --git a/util/runtime/Cargo.toml b/util/runtime/Cargo.toml
@@ -8,4 +8,4 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 futures = "0.1"
-tokio = "~0.1.9"
+tokio = "0.1.22"