Bump jsonrpc-core outside of sc-rpc-*

paritytech · andresilva · Jun 4, 2020 · Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020
commit 51d67c54feff6acf3049a08efab895559e3b7ad7
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml
@@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 sc-client-api = { version = "2.0.0-rc2", path = "../../../client/api" }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 node-primitives = { version = "2.0.0-rc2", path = "../primitives" }
 node-runtime = { version = "2.0.0-rc2", path = "../runtime" }
 sp-runtime = { version = "2.0.0-rc2", path = "../../../primitives/runtime" }

diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 sc-consensus-babe = { version = "0.8.0-rc2", path = "../" }
 sc-rpc-api = { version = "0.8.0-rc2", path = "../../../rpc-api" }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 jsonrpc-core-client = "14.0.5"
 jsonrpc-derive = "14.0.3"
 sp-consensus-babe = { version = "0.8.0-rc2", path = "../../../../primitives/consensus/babe" }

diff --git a/client/finality-grandpa/rpc/Cargo.toml b/client/finality-grandpa/rpc/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 sc-finality-grandpa = { version = "0.8.0-rc2", path = "../" }
 finality-grandpa = { version = "0.12.3", features = ["derive-codec"] }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 jsonrpc-core-client = "14.0.3"
 jsonrpc-derive = "14.0.3"
 futures = { version = "0.3.4", features = ["compat"] }

diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
@@ -26,6 +26,7 @@ test-helpers = []
 derive_more = "0.99.2"
 futures01 = { package = "futures", version = "0.1.29" }
 futures = { version = "0.3.4", features = ["compat"] }
+jsonrpc-pubsub = { package = "jsonrpc-pubsub", git = "https://github.com/paritytech/jsonrpc" }
 rand = "0.7.3"
 parking_lot = "0.10.0"
 lazy_static = "1.4.0"

diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
@@ -36,6 +36,7 @@ use futures::{
 	Future, FutureExt, StreamExt,
 	future::ready,
 };
+use jsonrpc_pubsub::manager::SubscriptionManager;
 use sc_keystore::Store as Keystore;
 use log::{info, warn, error};
 use sc_network::config::{Role, FinalityProofProvider, OnDemand, BoxFinalityProofRequestBuilder};
@@ -1185,7 +1186,7 @@ ServiceBuilder<
 				chain_type: chain_spec.chain_type().clone(),
 			};
 
-			let subscriptions = sc_rpc::Subscriptions::new(Arc::new(task_manager.spawn_handle()));
+			let subscriptions = SubscriptionManager::new(Arc::new(task_manager.spawn_handle()));
 
 			let (chain, state, child_state) = if let (Some(remote_backend), Some(on_demand)) =
 				(remote_backend.as_ref(), on_demand.as_ref()) {

@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0" }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 jsonrpc-core-client = "14.0.5"
 jsonrpc-derive = "14.0.3"
 sp-blockchain = { version = "2.0.0-rc2", path = "../../../primitives/blockchain" }

diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0" }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 jsonrpc-core-client = "14.0.5"
 jsonrpc-derive = "14.0.3"
 sp-core = { version = "2.0.0-rc2", path = "../../../primitives/core" }

diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 sc-client-api = { version = "2.0.0-rc2", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "1.3.0" }
 futures = { version = "0.3.4", features = ["compat"] }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { package = "jsonrpc-core", git = "https://github.com/paritytech/jsonrpc" }
 jsonrpc-core-client = "14.0.5"
 jsonrpc-derive = "14.0.3"
 log = "0.4.8"