Update RPC deps. (#4012)

* Bump rpc deps * Update core/test-runtime/src/genesismap.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>
paritytech · Nov 4, 2019 · 7874be8 · 7874be8
1 parent a7de9df
commit 7874be8
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/rpc-servers/Cargo.toml b/core/rpc-servers/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-jsonrpc-core = "13.2.0"
-pubsub = { package = "jsonrpc-pubsub", version = "13.2.0" }
+jsonrpc-core = "14.0.3"
+pubsub = { package = "jsonrpc-pubsub", version = "14.0.3" }
 log = "0.4.8"
 serde = "1.0.101"
 serde_json = "1.0.41"
 sr-primitives = { path = "../sr-primitives" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-http = { package = "jsonrpc-http-server", version = "13.2.0" }
-ws = { package = "jsonrpc-ws-server", version = "13.2.0" }
+http = { package = "jsonrpc-http-server", version = "14.0.3" }
+ws = { package = "jsonrpc-ws-server", version = "14.0.3" }
diff --git a/core/rpc/Cargo.toml b/core/rpc/Cargo.toml
@@ -9,10 +9,10 @@ api = { package = "substrate-rpc-api", path = "./api" }
 client = { package = "substrate-client", path = "../client" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
-jsonrpc-pubsub = "13.1.0"
+jsonrpc-pubsub = "14.0.3"
 log = "0.4.8"
 primitives = { package = "substrate-primitives", path = "../primitives" }
-rpc = { package = "jsonrpc-core", version = "13.0.0" }
+rpc = { package = "jsonrpc-core", version = "14.0.3" }
 runtime_version = { package = "sr-version", path = "../sr-version" }
 serde_json = "1.0.41"
 session = { package = "substrate-session", path = "../session" }

diff --git a/core/rpc/api/Cargo.toml b/core/rpc/api/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 derive_more = "0.15.0"
 futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] }
-jsonrpc-core = "13.2.0"
-jsonrpc-core-client = "13.2.0"
-jsonrpc-derive = "13.2.0"
-jsonrpc-pubsub = "13.2.0"
+jsonrpc-core = "14.0.3"
+jsonrpc-core-client = "14.0.3"
+jsonrpc-derive = "14.0.3"
+jsonrpc-pubsub = "14.0.3"
 log = "0.4.8"
 parking_lot = "0.9.0"
 primitives = { package = "substrate-primitives", path = "../../primitives" }

diff --git a/core/test-runtime/src/genesismap.rs b/core/test-runtime/src/genesismap.rs
@@ -84,7 +84,7 @@ impl GenesisConfig {
 		let mut storage = (map, self.child_extra_storage.clone());
 		let mut config = system::GenesisConfig::default();
 		config.authorities = self.authorities.clone();
-		config.assimilate_storage(&mut storage);
+		config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis");
 
 		storage
 	}

diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -24,7 +24,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 log = "0.4.8"
 futures = "0.1.29"
-jsonrpc-core = "13.2.0"
+jsonrpc-core = "14.0.3"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 sr-io = { path = "../../core/sr-io" }
 client = { package = "substrate-client", path = "../../core/client" }

diff --git a/node/rpc-client/Cargo.toml b/node/rpc-client/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 env_logger = "0.7.0"
 futures = "0.1.29"
 hyper = "0.12.35"
-jsonrpc-core-client = { version = "13.1.0", features = ["http", "ws"] }
+jsonrpc-core-client = { version = "14.0.3", features = ["http", "ws"] }
 log = "0.4.8"
 node-primitives = { path = "../primitives" }
 substrate-rpc = { path = "../../core/rpc", version = "2.0.0" }
diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 client = { package = "substrate-client", path = "../../core/client" }
-jsonrpc-core = "13.2.0"
+jsonrpc-core = "14.0.3"
 node-primitives = { path = "../primitives" }
 node-runtime = { path = "../runtime" }
 sr-primitives = { path = "../../core/sr-primitives" }

diff --git a/srml/contracts/rpc/Cargo.toml b/srml/contracts/rpc/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 [dependencies]
 client = { package = "substrate-client", path = "../../../core/client" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-jsonrpc-core = "13.2.0"
-jsonrpc-core-client = "13.2.0"
-jsonrpc-derive = "13.2.0"
+jsonrpc-core = "14.0.3"
+jsonrpc-core-client = "14.0.3"
+jsonrpc-derive = "14.0.3"
 primitives = { package = "substrate-primitives",  path = "../../../core/primitives" }
 rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../core/rpc/primitives" }
 serde = { version = "1.0.101", features = ["derive"] }

diff --git a/srml/system/rpc/Cargo.toml b/srml/system/rpc/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 [dependencies]
 client = { package = "substrate-client", path = "../../../core/client" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-jsonrpc-core = "13.2.0"
-jsonrpc-core-client = "13.2.0"
-jsonrpc-derive = "13.2.0"
+jsonrpc-core = "14.0.3"
+jsonrpc-core-client = "14.0.3"
+jsonrpc-derive = "14.0.3"
 log = "0.4.8"
 serde = { version = "1.0.101", features = ["derive"] }
 sr-primitives = { path = "../../../core/sr-primitives" }

diff --git a/srml/transaction-payment/rpc/Cargo.toml b/srml/transaction-payment/rpc/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 [dependencies]
 client = { package = "substrate-client", path = "../../../core/client" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-jsonrpc-core = "13.2.0"
-jsonrpc-core-client = "13.2.0"
-jsonrpc-derive = "13.2.0"
+jsonrpc-core = "14.0.3"
+jsonrpc-core-client = "14.0.3"
+jsonrpc-derive = "14.0.3"
 primitives = { package = "substrate-primitives",  path = "../../../core/primitives" }
 rpc-primitives = { package = "substrate-rpc-primitives", path = "../../../core/rpc/primitives" }
 serde = { version = "1.0.101", features = ["derive"] }