From ae52587f41cd8e7c74338b7e2d27a475561dd3bb Mon Sep 17 00:00:00 2001
From: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com>
Date: Mon, 21 Sep 2020 10:46:10 +0200
Subject: [PATCH] Bump jsonrpc-* dependencies to v15 (#7157)
* Bump jsonrpc-* dependencies to v15
* Remove unused imports
---
substrate/Cargo.lock | 74 +++++++++----------
substrate/bin/node-template/node/Cargo.toml | 2 +-
substrate/bin/node/browser-testing/Cargo.toml | 2 +-
substrate/bin/node/rpc-client/Cargo.toml | 2 +-
substrate/bin/node/rpc/Cargo.toml | 2 +-
.../client/consensus/babe/rpc/Cargo.toml | 6 +-
.../client/consensus/manual-seal/Cargo.toml | 6 +-
.../client/finality-grandpa/rpc/Cargo.toml | 8 +-
substrate/client/rpc-api/Cargo.toml | 8 +-
substrate/client/rpc-api/src/chain/mod.rs | 1 -
substrate/client/rpc-api/src/state/mod.rs | 1 -
substrate/client/rpc-servers/Cargo.toml | 10 +--
substrate/client/rpc/Cargo.toml | 4 +-
substrate/client/service/Cargo.toml | 4 +-
substrate/frame/contracts/rpc/Cargo.toml | 6 +-
.../frame/transaction-payment/rpc/Cargo.toml | 6 +-
substrate/utils/frame/rpc/support/Cargo.toml | 4 +-
substrate/utils/frame/rpc/system/Cargo.toml | 6 +-
18 files changed, 75 insertions(+), 77 deletions(-)
diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 3b08f91f2a8..2cfe7023990 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -2502,9 +2502,9 @@ dependencies = [
[[package]]
name = "jsonrpc-client-transports"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecbdaacc17243168d9d1fa6b2bd7556a27e1e60a621d8a2a6e590ae2b145d158"
+checksum = "c6f7b1cdf66312002e15682a24430728bd13036c641163c016bc53fb686a7c2d"
dependencies = [
"failure",
"futures 0.1.29",
@@ -2519,9 +2519,9 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62"
+checksum = "f30b12567a31d48588a65b6cf870081e6ba1d7b2ae353977cb9820d512e69c70"
dependencies = [
"futures 0.1.29",
"log",
@@ -2532,18 +2532,18 @@ dependencies = [
[[package]]
name = "jsonrpc-core-client"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713"
+checksum = "d175ca0cf77439b5495612bf216c650807d252d665b4b70ab2eebd895a88fac1"
dependencies = [
"jsonrpc-client-transports",
]
[[package]]
name = "jsonrpc-derive"
-version = "14.2.1"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef"
+checksum = "c2cc6ea7f785232d9ca8786a44e9fa698f92149dcdc1acc4aa1fc69c4993d79e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2553,9 +2553,9 @@ dependencies = [
[[package]]
name = "jsonrpc-http-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522"
+checksum = "9996b26c0c7a59626d0ed6c5ec8bf06218e62ce1474bd2849f9b9fd38a0158c0"
dependencies = [
"hyper 0.12.35",
"jsonrpc-core",
@@ -2568,9 +2568,9 @@ dependencies = [
[[package]]
name = "jsonrpc-ipc-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dedccd693325d833963b549e959137f30a7a0ea650cde92feda81dc0c1393cb5"
+checksum = "b8e8f2278fb2b277175b6e21b23e7ecf30e78daff5ee301d0a2a411d9a821a0a"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
@@ -2582,9 +2582,9 @@ dependencies = [
[[package]]
name = "jsonrpc-pubsub"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986"
+checksum = "f389c5cd1f3db258a99296892c21047e21ae73ff4c0e2d39650ea86fe994b4c7"
dependencies = [
"jsonrpc-core",
"log",
@@ -2595,9 +2595,9 @@ dependencies = [
[[package]]
name = "jsonrpc-server-utils"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb"
+checksum = "c623e1895d0d9110cb0ea7736cfff13191ff52335ad33b21bd5c775ea98b27af"
dependencies = [
"bytes 0.4.12",
"globset",
@@ -2611,16 +2611,16 @@ dependencies = [
[[package]]
name = "jsonrpc-ws-server"
-version = "14.2.0"
+version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc"
+checksum = "436a92034d0137ab3e3c64a7a6350b428f31cb4d7d1a89f284bcdbcd98a7bc56"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
"log",
+ "parity-ws",
"parking_lot 0.10.2",
"slab",
- "ws",
]
[[package]]
@@ -5206,6 +5206,24 @@ version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
+[[package]]
+name = "parity-ws"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61"
+dependencies = [
+ "byteorder 1.3.4",
+ "bytes 0.4.12",
+ "httparse",
+ "log",
+ "mio",
+ "mio-extras",
+ "rand 0.7.3",
+ "sha-1",
+ "slab",
+ "url 2.1.1",
+]
+
[[package]]
name = "parking"
version = "1.0.5"
@@ -10168,24 +10186,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "ws"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
-dependencies = [
- "byteorder 1.3.4",
- "bytes 0.4.12",
- "httparse",
- "log",
- "mio",
- "mio-extras",
- "rand 0.7.3",
- "sha-1",
- "slab",
- "url 2.1.1",
-]
-
[[package]]
name = "ws2_32-sys"
version = "0.2.1"
diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index eb3b63b926f..7955825beed 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -35,7 +35,7 @@ sc-client-api = { version = "2.0.0-rc6", path = "../../../client/api" }
sp-runtime = { version = "2.0.0-rc6", path = "../../../primitives/runtime" }
# These dependencies are used for the node template's RPCs
-jsonrpc-core = "14.0.3"
+jsonrpc-core = "15.0.0"
sc-rpc = { version = "2.0.0-rc6", path = "../../../client/rpc" }
sp-api = { version = "2.0.0-rc6", path = "../../../primitives/api" }
sc-rpc-api = { version = "0.8.0-rc6", path = "../../../client/rpc-api" }
diff --git a/substrate/bin/node/browser-testing/Cargo.toml b/substrate/bin/node/browser-testing/Cargo.toml
index a6945d31635..d171b594b01 100644
--- a/substrate/bin/node/browser-testing/Cargo.toml
+++ b/substrate/bin/node/browser-testing/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
[dependencies]
futures-timer = "3.0.2"
libp2p = { version = "0.28.1", default-features = false }
-jsonrpc-core = "14.2.0"
+jsonrpc-core = "15.0.0"
serde = "1.0.106"
serde_json = "1.0.48"
wasm-bindgen = { version = "=0.2.67", features = ["serde-serialize"] }
diff --git a/substrate/bin/node/rpc-client/Cargo.toml b/substrate/bin/node/rpc-client/Cargo.toml
index 92e1e1d3af1..9c51aa3b98a 100644
--- a/substrate/bin/node/rpc-client/Cargo.toml
+++ b/substrate/bin/node/rpc-client/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = "0.1.29"
hyper = "0.12.35"
-jsonrpc-core-client = { version = "14.2.0", default-features = false, features = ["http"] }
+jsonrpc-core-client = { version = "15.0.0", default-features = false, features = ["http"] }
log = "0.4.8"
node-primitives = { version = "2.0.0-rc6", path = "../primitives" }
sp-tracing = { version = "2.0.0-rc6", path = "../../../primitives/tracing" }
diff --git a/substrate/bin/node/rpc/Cargo.toml b/substrate/bin/node/rpc/Cargo.toml
index 020fc88a3d0..0bac2f040ab 100644
--- a/substrate/bin/node/rpc/Cargo.toml
+++ b/substrate/bin/node/rpc/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-jsonrpc-core = "14.2.0"
+jsonrpc-core = "15.0.0"
node-primitives = { version = "2.0.0-rc6", path = "../primitives" }
node-runtime = { version = "2.0.0-rc6", path = "../runtime" }
pallet-contracts-rpc = { version = "0.8.0-rc6", path = "../../../frame/contracts/rpc/" }
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index 4d2e89af3b0..505678655f1 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
sc-consensus-babe = { version = "0.8.0-rc6", path = "../" }
sc-rpc-api = { version = "0.8.0-rc6", path = "../../../rpc-api" }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
sp-consensus-babe = { version = "0.8.0-rc6", path = "../../../../primitives/consensus/babe" }
serde = { version = "1.0.104", features=["derive"] }
sp-blockchain = { version = "2.0.0-rc6", path = "../../../../primitives/blockchain" }
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index 33f443bce9d..8920e3453b5 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
derive_more = "0.99.2"
futures = "0.3.4"
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
log = "0.4.8"
parking_lot = "0.10.0"
serde = { version = "1.0", features=["derive"] }
diff --git a/substrate/client/finality-grandpa/rpc/Cargo.toml b/substrate/client/finality-grandpa/rpc/Cargo.toml
index 0112ddd420c..90d3f2c7a0f 100644
--- a/substrate/client/finality-grandpa/rpc/Cargo.toml
+++ b/substrate/client/finality-grandpa/rpc/Cargo.toml
@@ -14,10 +14,10 @@ sp-blockchain = { version = "2.0.0-rc6", path = "../../../primitives/blockchain"
sp-core = { version = "2.0.0-rc6", path = "../../../primitives/core" }
sp-runtime = { version = "2.0.0-rc6", path = "../../../primitives/runtime" }
finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
-jsonrpc-pubsub = "14.2.0"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
+jsonrpc-pubsub = "15.0.0"
futures = { version = "0.3.4", features = ["compat"] }
serde = { version = "1.0.105", features = ["derive"] }
serde_json = "1.0.50"
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index 95080911320..57d85d8569a 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "1.3.4" }
derive_more = "0.99.2"
futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
-jsonrpc-pubsub = "14.2.0"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
+jsonrpc-pubsub = "15.0.0"
log = "0.4.8"
parking_lot = "0.10.0"
sp-core = { version = "2.0.0-rc6", path = "../../primitives/core" }
diff --git a/substrate/client/rpc-api/src/chain/mod.rs b/substrate/client/rpc-api/src/chain/mod.rs
index 753ac5617a2..9bb75216c01 100644
--- a/substrate/client/rpc-api/src/chain/mod.rs
+++ b/substrate/client/rpc-api/src/chain/mod.rs
@@ -21,7 +21,6 @@
pub mod error;
use jsonrpc_core::Result as RpcResult;
-use jsonrpc_core::futures::Future;
use jsonrpc_derive::rpc;
use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
use sp_rpc::{number::NumberOrHex, list::ListOrValue};
diff --git a/substrate/client/rpc-api/src/state/mod.rs b/substrate/client/rpc-api/src/state/mod.rs
index 1bfbb4786e6..874fc862a39 100644
--- a/substrate/client/rpc-api/src/state/mod.rs
+++ b/substrate/client/rpc-api/src/state/mod.rs
@@ -22,7 +22,6 @@ pub mod error;
pub mod helpers;
use jsonrpc_core::Result as RpcResult;
-use jsonrpc_core::futures::Future;
use jsonrpc_derive::rpc;
use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
use sp_core::Bytes;
diff --git a/substrate/client/rpc-servers/Cargo.toml b/substrate/client/rpc-servers/Cargo.toml
index 0d3589a00a6..0bbc03eb2ce 100644
--- a/substrate/client/rpc-servers/Cargo.toml
+++ b/substrate/client/rpc-servers/Cargo.toml
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = "0.1.6"
-jsonrpc-core = "14.2.0"
-pubsub = { package = "jsonrpc-pubsub", version = "14.2.0" }
+jsonrpc-core = "15.0.0"
+pubsub = { package = "jsonrpc-pubsub", version = "15.0.0" }
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0-rc6"}
serde = "1.0.101"
@@ -22,6 +22,6 @@ serde_json = "1.0.41"
sp-runtime = { version = "2.0.0-rc6", path = "../../primitives/runtime" }
[target.'cfg(not(target_os = "unknown"))'.dependencies]
-http = { package = "jsonrpc-http-server", version = "14.2.0" }
-ipc = { version = "14.2.0", package = "jsonrpc-ipc-server" }
-ws = { package = "jsonrpc-ws-server", version = "14.2.0" }
+http = { package = "jsonrpc-http-server", version = "15.0.0" }
+ipc = { package = "jsonrpc-ipc-server", version = "15.0.0" }
+ws = { package = "jsonrpc-ws-server", version = "15.0.0" }
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index fe4a02aa83f..3c28552bd54 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -17,10 +17,10 @@ sc-client-api = { version = "2.0.0-rc6", path = "../api" }
sp-api = { version = "2.0.0-rc6", path = "../../primitives/api" }
codec = { package = "parity-scale-codec", version = "1.3.4" }
futures = { version = "0.3.1", features = ["compat"] }
-jsonrpc-pubsub = "14.2.0"
+jsonrpc-pubsub = "15.0.0"
log = "0.4.8"
sp-core = { version = "2.0.0-rc6", path = "../../primitives/core" }
-rpc = { package = "jsonrpc-core", version = "14.2.0" }
+rpc = { package = "jsonrpc-core", version = "15.0.0" }
sp-version = { version = "2.0.0-rc6", path = "../../primitives/version" }
serde_json = "1.0.41"
sp-session = { version = "2.0.0-rc6", path = "../../primitives/session" }
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index fb9d489adf4..05403b4ddd0 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -26,8 +26,8 @@ test-helpers = []
derive_more = "0.99.2"
futures01 = { package = "futures", version = "0.1.29" }
futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-pubsub = "14.2"
-jsonrpc-core = "14.2"
+jsonrpc-pubsub = "15.0"
+jsonrpc-core = "15.0"
rand = "0.7.3"
parking_lot = "0.10.0"
lazy_static = "1.4.0"
diff --git a/substrate/frame/contracts/rpc/Cargo.toml b/substrate/frame/contracts/rpc/Cargo.toml
index 0de6bc105a9..1f6be613046 100644
--- a/substrate/frame/contracts/rpc/Cargo.toml
+++ b/substrate/frame/contracts/rpc/Cargo.toml
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4" }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
sp-blockchain = { version = "2.0.0-rc6", path = "../../../primitives/blockchain" }
sp-core = { version = "2.0.0-rc6", path = "../../../primitives/core" }
sp-rpc = { version = "2.0.0-rc6", path = "../../../primitives/rpc" }
diff --git a/substrate/frame/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
index d3d03dd1a4d..91c2977b966 100644
--- a/substrate/frame/transaction-payment/rpc/Cargo.toml
+++ b/substrate/frame/transaction-payment/rpc/Cargo.toml
@@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.1" }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
sp-core = { version = "2.0.0-rc6", path = "../../../primitives/core" }
sp-rpc = { version = "2.0.0-rc6", path = "../../../primitives/rpc" }
serde = { version = "1.0.101", features = ["derive"] }
diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
index 784fe90cdf3..d24655c5a97 100644
--- a/substrate/utils/frame/rpc/support/Cargo.toml
+++ b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = { version = "0.3.0", features = ["compat"] }
-jsonrpc-client-transports = { version = "14.2.0", default-features = false, features = ["http"] }
-jsonrpc-core = "14.2.0"
+jsonrpc-client-transports = { version = "15.0.0", default-features = false, features = ["http"] }
+jsonrpc-core = "15.0.0"
codec = { package = "parity-scale-codec", version = "1.3.1" }
serde = "1"
frame-support = { version = "2.0.0-rc6", path = "../../../../frame/support" }
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index fc4774738b8..cdc86e6656d 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
sc-client-api = { version = "2.0.0-rc6", path = "../../../../client/api" }
codec = { package = "parity-scale-codec", version = "1.3.1" }
futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-core = "14.2.0"
-jsonrpc-core-client = "14.2.0"
-jsonrpc-derive = "14.2.1"
+jsonrpc-core = "15.0.0"
+jsonrpc-core-client = "15.0.0"
+jsonrpc-derive = "15.0.0"
log = "0.4.8"
serde = { version = "1.0.101", features = ["derive"] }
sp-runtime = { version = "2.0.0-rc6", path = "../../../../primitives/runtime" }
--
GitLab