Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Bump jsonrpc-* dependencies to v15 #7157

Merged
2 commits merged into from
Sep 21, 2020
Merged

Bump jsonrpc-* dependencies to v15 #7157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8381d
Bump jsonrpc-* dependencies to v15
maciejhirsz Sep 21, 2020
ab88621
Remove unused imports
maciejhirsz Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/node-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/browser-testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/rpc-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/" }
Expand Down
6 changes: 3 additions & 3 deletions client/consensus/babe/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 3 additions & 3 deletions client/consensus/manual-seal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
8 changes: 4 additions & 4 deletions client/finality-grandpa/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions client/rpc-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 0 additions & 1 deletion client/rpc-api/src/chain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
1 change: 0 additions & 1 deletion client/rpc-api/src/state/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions client/rpc-servers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ 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"
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" }
4 changes: 2 additions & 2 deletions client/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions client/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions frame/contracts/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 3 additions & 3 deletions frame/transaction-payment/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions utils/frame/rpc/support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
6 changes: 3 additions & 3 deletions utils/frame/rpc/system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down