diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 3ab2692d43033dbc5c93b3a5e1cb105f9f1ed88c..c096428e94dbfd11b4d65d9a1a83474203e0f464 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -1957,7 +1957,6 @@ dependencies = [
"cumulus-relay-chain-interface",
"cumulus-relay-chain-minimal-node",
"futures",
- "parking_lot 0.12.1",
"polkadot-primitives",
"sc-client-api",
"sc-consensus",
@@ -2255,7 +2254,6 @@ dependencies = [
"sp-blockchain",
"sp-state-machine",
"thiserror",
- "tokio",
]
[[package]]
@@ -2278,15 +2276,10 @@ dependencies = [
"polkadot-service",
"sc-authority-discovery",
"sc-client-api",
- "sc-consensus",
- "sc-keystore",
"sc-network",
"sc-network-common",
"sc-service",
- "sc-telemetry",
"sc-tracing",
- "sc-transaction-pool",
- "sc-transaction-pool-api",
"sp-api",
"sp-blockchain",
"sp-consensus",
@@ -2294,7 +2287,6 @@ dependencies = [
"sp-runtime",
"tokio",
"tracing",
- "url",
]
[[package]]
@@ -2309,9 +2301,10 @@ dependencies = [
"jsonrpsee",
"lru 0.9.0",
"parity-scale-codec",
- "polkadot-service",
+ "polkadot-overseer",
"sc-client-api",
"sc-rpc-api",
+ "sc-service",
"serde",
"serde_json",
"sp-api",
@@ -2417,7 +2410,6 @@ dependencies = [
"cumulus-client-cli",
"cumulus-client-consensus-common",
"cumulus-client-consensus-relay-chain",
- "cumulus-client-network",
"cumulus-client-pov-recovery",
"cumulus-client-service",
"cumulus-primitives-core",
@@ -2425,7 +2417,6 @@ dependencies = [
"cumulus-relay-chain-inprocess-interface",
"cumulus-relay-chain-interface",
"cumulus-relay-chain-minimal-node",
- "cumulus-relay-chain-rpc-interface",
"cumulus-test-relay-validation-worker-provider",
"cumulus-test-runtime",
"frame-system",
@@ -7094,7 +7085,6 @@ dependencies = [
"cumulus-client-cli",
"cumulus-client-consensus-aura",
"cumulus-client-consensus-common",
- "cumulus-client-network",
"cumulus-client-service",
"cumulus-primitives-core",
"cumulus-primitives-parachain-inherent",
@@ -7108,14 +7098,12 @@ dependencies = [
"parity-scale-codec",
"polkadot-cli",
"polkadot-primitives",
- "polkadot-service",
"sc-basic-authorship",
"sc-chain-spec",
"sc-cli",
"sc-client-api",
"sc-consensus",
"sc-executor",
- "sc-network",
"sc-network-common",
"sc-network-sync",
"sc-rpc",
@@ -7133,11 +7121,8 @@ dependencies = [
"sp-core",
"sp-io",
"sp-keystore",
- "sp-offchain",
"sp-runtime",
- "sp-session",
"sp-timestamp",
- "sp-transaction-pool",
"substrate-build-script-utils",
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
@@ -8353,7 +8338,6 @@ dependencies = [
"cumulus-client-consensus-aura",
"cumulus-client-consensus-common",
"cumulus-client-consensus-relay-chain",
- "cumulus-client-network",
"cumulus-client-service",
"cumulus-primitives-core",
"cumulus-primitives-parachain-inherent",
@@ -8395,7 +8379,6 @@ dependencies = [
"sp-api",
"sp-block-builder",
"sp-blockchain",
- "sp-consensus",
"sp-consensus-aura",
"sp-core",
"sp-io",
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index d6c9981d98d2e057d27c15d760f8bd5660618936..28edc3e61bcd43534b297f4325bf66fe060f3f41 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -14,7 +14,6 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-tokio = { version = "1.25.0", features = ["sync"] }
futures = "0.3.26"
async-trait = "0.1.63"
thiserror = "1.0.38"
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 5cdbd405a23c373c4e2298574d5746e2a4ba2cc2..6b46d9250d98e60110c8b7b9fe8812b4f8147c0a 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -17,15 +17,10 @@ polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", bran
# substrate deps
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -42,5 +37,4 @@ lru = "0.9"
tracing = "0.1.37"
async-trait = "0.1.63"
futures = "0.3.26"
-url = "2.2.2"
tokio = { version = "1.25.0", features = ["macros"] }
diff --git a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
index 5bce139b0a55e2f2a097c74a7de576ace92c6442..7c4674a4e2c57c7c7f70df4eb6c078a5bd942cbe 100644
--- a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -19,13 +19,12 @@ use std::pin::Pin;
use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
use cumulus_relay_chain_rpc_interface::RelayChainRpcClient;
use futures::{Future, Stream, StreamExt};
-use polkadot_core_primitives::{Block, Hash, Header};
+use polkadot_core_primitives::{Block, BlockNumber, Hash, Header};
use polkadot_overseer::RuntimeApiSubsystemClient;
-use polkadot_service::{AuxStore, HeaderBackend};
use sc_authority_discovery::AuthorityDiscovery;
-
use sp_api::{ApiError, RuntimeApiInfo};
-use sp_blockchain::Info;
+use sp_blockchain::{HeaderBackend, Info};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
#[derive(Clone)]
pub struct BlockChainRpcClient {
@@ -46,34 +45,12 @@ impl BlockChainRpcClient {
pub async fn block_get_hash(
&self,
- number: Option<polkadot_service::BlockNumber>,
+ number: Option<BlockNumber>,
) -> Result<Option<Hash>, RelayChainError> {
self.rpc_client.chain_get_block_hash(number).await
}
}
-// Implementation required by Availability-Distribution subsystem
-// but never called in our case.
-impl AuxStore for BlockChainRpcClient {
- fn insert_aux<
- 'a,
- 'b: 'a,
- 'c: 'a,
- I: IntoIterator<Item = &'a (&'c [u8], &'c [u8])>,
- D: IntoIterator<Item = &'a &'b [u8]>,
- >(
- &self,
- _insert: I,
- _delete: D,
- ) -> sp_blockchain::Result<()> {
- unimplemented!("Not supported on the RPC collator")
- }
-
- fn get_aux(&self, _key: &[u8]) -> sp_blockchain::Result<Option<Vec<u8>>> {
- unimplemented!("Not supported on the RPC collator")
- }
-}
-
#[async_trait::async_trait]
impl RuntimeApiSubsystemClient for BlockChainRpcClient {
async fn validators(
@@ -359,8 +336,8 @@ fn block_local<T>(fut: impl Future<Output = T>) -> T {
impl HeaderBackend<Block> for BlockChainRpcClient {
fn header(
&self,
- hash: <Block as polkadot_service::BlockT>::Hash,
- ) -> sp_blockchain::Result<Option<<Block as polkadot_service::BlockT>::Header>> {
+ hash: <Block as BlockT>::Hash,
+ ) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
Ok(block_local(self.rpc_client.chain_get_header(Some(hash)))?)
}
@@ -389,7 +366,7 @@ impl HeaderBackend<Block> for BlockChainRpcClient {
fn status(
&self,
- hash: <Block as polkadot_service::BlockT>::Hash,
+ hash: <Block as BlockT>::Hash,
) -> sp_blockchain::Result<sp_blockchain::BlockStatus> {
if self.header(hash)?.is_some() {
Ok(sc_client_api::blockchain::BlockStatus::InChain)
@@ -400,10 +377,8 @@ impl HeaderBackend<Block> for BlockChainRpcClient {
fn number(
&self,
- hash: <Block as polkadot_service::BlockT>::Hash,
- ) -> sp_blockchain::Result<
- Option<<<Block as polkadot_service::BlockT>::Header as polkadot_service::HeaderT>::Number>,
- > {
+ hash: <Block as BlockT>::Hash,
+ ) -> sp_blockchain::Result<Option<<<Block as BlockT>::Header as HeaderT>::Number>> {
let result = block_local(self.rpc_client.chain_get_header(Some(hash)))?
.map(|maybe_header| maybe_header.number);
Ok(result)
@@ -411,8 +386,8 @@ impl HeaderBackend<Block> for BlockChainRpcClient {
fn hash(
&self,
- number: polkadot_service::NumberFor<Block>,
- ) -> sp_blockchain::Result<Option<<Block as polkadot_service::BlockT>::Hash>> {
+ number: NumberFor<Block>,
+ ) -> sp_blockchain::Result<Option<<Block as BlockT>::Hash>> {
Ok(block_local(self.rpc_client.chain_get_block_hash(number.into()))?)
}
}
diff --git a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
index 0fe185fca97b3ca4adc5a1b3be9573e7befa5187..dce68e3b1f6d137172e5c277b9d8fe8e66582986 100644
--- a/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/collator_overseer.rs
@@ -14,8 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
-use cumulus_relay_chain_interface::RelayChainError;
+use futures::{select, StreamExt};
use lru::LruCache;
+use std::sync::Arc;
+
use polkadot_node_network_protocol::{
peer_set::PeerSetProtocolNames,
request_response::{
@@ -25,8 +27,8 @@ use polkadot_node_network_protocol::{
};
use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics};
use polkadot_overseer::{
- BlockInfo, DummySubsystem, MetricsTrait, Overseer, OverseerHandle, OverseerMetrics, SpawnGlue,
- KNOWN_LEAVES_CACHE_SIZE,
+ BlockInfo, DummySubsystem, Handle, MetricsTrait, Overseer, OverseerHandle, OverseerMetrics,
+ SpawnGlue, KNOWN_LEAVES_CACHE_SIZE,
};
use polkadot_primitives::CollatorPair;
use polkadot_service::{
@@ -37,18 +39,16 @@ use polkadot_service::{
},
Error, OverseerConnector,
};
+
use sc_authority_discovery::Service as AuthorityDiscoveryService;
use sc_network::NetworkStateInfo;
-
-use std::sync::Arc;
+use sc_service::TaskManager;
+use sp_runtime::traits::Block as BlockT;
use cumulus_primitives_core::relay_chain::{Block, Hash as PHash};
-
-use polkadot_service::{Handle, TaskManager};
+use cumulus_relay_chain_interface::RelayChainError;
use crate::BlockChainRpcClient;
-use futures::{select, StreamExt};
-use sp_runtime::traits::Block as BlockT;
/// Arguments passed for overseer construction.
pub(crate) struct CollatorOverseerGenArgs<'a> {
diff --git a/cumulus/client/relay-chain-minimal-node/src/lib.rs b/cumulus/client/relay-chain-minimal-node/src/lib.rs
index 893ac02824a3300814762760587f80bc65fc40a4..08db3753a6b7260a1c703bee60b655e4417b6d44 100644
--- a/cumulus/client/relay-chain-minimal-node/src/lib.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/lib.rs
@@ -30,13 +30,11 @@ use polkadot_primitives::CollatorPair;
use sc_authority_discovery::Service as AuthorityDiscoveryService;
use sc_network::{Event, NetworkService};
use sc_network_common::service::NetworkEventStream;
-use std::sync::Arc;
-
-use polkadot_service::{Configuration, TaskManager};
+use sc_service::{Configuration, TaskManager};
+use sp_runtime::{app_crypto::Pair, traits::Block as BlockT};
use futures::StreamExt;
-
-use sp_runtime::{app_crypto::Pair, traits::Block as BlockT};
+use std::sync::Arc;
mod collator_overseer;
diff --git a/cumulus/client/relay-chain-minimal-node/src/network.rs b/cumulus/client/relay-chain-minimal-node/src/network.rs
index 55b29ba4a11d25429655882529425dd59beef166..bda05daf7b71c4bf40422f2d69d59a5671a2b40c 100644
--- a/cumulus/client/relay-chain-minimal-node/src/network.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/network.rs
@@ -15,7 +15,7 @@
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use polkadot_core_primitives::{Block, Hash};
-use polkadot_service::{BlockT, NumberFor};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
use sc_network::NetworkService;
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index 70afef3c7a7f25189ac1ff73f4f3ca225ba0ffcf..4d0459739195773ccc40481fd38da84ff791c04e 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
@@ -19,6 +19,8 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
tokio = { version = "1.25.0", features = ["sync"] }
futures = "0.3.26"
diff --git a/cumulus/client/relay-chain-rpc-interface/src/lib.rs b/cumulus/client/relay-chain-rpc-interface/src/lib.rs
index 748a2b26e68290d4a0a77a3907454c1d1178ddd2..475d5d905b6cf62fa2b64a292ed409275968d97e 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/lib.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/lib.rs
@@ -25,7 +25,8 @@ use cumulus_primitives_core::{
};
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
use futures::{FutureExt, Stream, StreamExt};
-use polkadot_service::Handle;
+use polkadot_overseer::Handle;
+
use sc_client_api::StorageProof;
use sp_core::sp_std::collections::btree_map::BTreeMap;
use sp_state_machine::StorageValue;
diff --git a/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs b/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
index 3414dd652c696de9c95d2fde716c20a1208c43dc..9184ab746515b015d134d975142bca0ee47ccc9f 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs
@@ -37,7 +37,7 @@ use jsonrpsee::{
ws_client::WsClientBuilder,
};
use lru::LruCache;
-use polkadot_service::TaskManager;
+use sc_service::TaskManager;
use std::{num::NonZeroUsize, sync::Arc};
use tokio::sync::mpsc::{
channel as tokio_channel, Receiver as TokioReceiver, Sender as TokioSender,
diff --git a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
index 0d3b2c8492e47b76000f78f532aa1df15127d4a3..6a7dc0bb5aeb6c2b5bd503f8d4ea984e8e9c8511 100644
--- a/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
+++ b/cumulus/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -14,10 +14,23 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
-use crate::reconnecting_ws_client::ReconnectingWsClient;
+use futures::channel::mpsc::Receiver;
+use jsonrpsee::{core::params::ArrayParams, rpc_params};
+use parity_scale_codec::{Decode, Encode};
+use serde::de::DeserializeOwned;
+pub use url::Url;
+
+use sc_client_api::StorageData;
+use sc_rpc_api::{state::ReadProof, system::Health};
+use sc_service::TaskManager;
+use sp_api::RuntimeVersion;
+use sp_consensus_babe::Epoch;
+use sp_core::sp_std::collections::btree_map::BTreeMap;
+use sp_storage::StorageKey;
+
use cumulus_primitives_core::{
relay_chain::{
- vstaging::ExecutorParams, CandidateCommitments, CandidateEvent, CandidateHash,
+ vstaging::ExecutorParams, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash,
CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Hash as RelayHash,
Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption, PvfCheckStatement,
ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
@@ -26,18 +39,8 @@ use cumulus_primitives_core::{
InboundDownwardMessage, ParaId, PersistedValidationData,
};
use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
-use futures::channel::mpsc::Receiver;
-use jsonrpsee::{core::params::ArrayParams, rpc_params};
-use parity_scale_codec::{Decode, Encode};
-use polkadot_service::{BlockNumber, TaskManager};
-use sc_client_api::StorageData;
-use sc_rpc_api::{state::ReadProof, system::Health};
-use serde::de::DeserializeOwned;
-use sp_api::RuntimeVersion;
-use sp_consensus_babe::Epoch;
-use sp_core::sp_std::collections::btree_map::BTreeMap;
-use sp_storage::StorageKey;
-pub use url::Url;
+
+use crate::reconnecting_ws_client::ReconnectingWsClient;
const LOG_TARGET: &str = "relay-chain-rpc-client";
@@ -261,7 +264,7 @@ impl RelayChainRpcClient {
/// Get hash of n-th block.
pub async fn chain_get_block_hash(
&self,
- block_number: Option<polkadot_service::BlockNumber>,
+ block_number: Option<BlockNumber>,
) -> Result<Option<RelayHash>, RelayChainError> {
let params = rpc_params![block_number];
self.request("chain_getBlockHash", params).await
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index d72cbed4b8ac51262d0e8cfa6920e0f17fc620f9..f758116f33c41fd2c9a1f75b7cdb3585cb94615a 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
[dependencies]
-parking_lot = "0.12.1"
futures = "0.3.26"
# Substrate
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index e0d1e670e2c949723f6f7d3e8eecfd1da5a2aab3..088727e4dad6a60e72f89c384b3db7b5e7217321 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -29,7 +29,6 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -45,12 +44,9 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
@@ -58,14 +54,12 @@ try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "m
# Polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
# Cumulus
cumulus-client-cli = { path = "../../client/cli" }
cumulus-client-consensus-aura = { path = "../../client/consensus/aura" }
cumulus-client-consensus-common = { path = "../../client/consensus/common" }
-cumulus-client-network = { path = "../../client/network" }
cumulus-client-service = { path = "../../client/service" }
cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index 32c50b43a8476a51a65ad39746d5ce174af6d8e5..ecb11cafa93229dde0779720e9ddafeb0ae3dc40 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -41,7 +41,6 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -86,7 +85,6 @@ cumulus-client-consensus-aura = { path = "../client/consensus/aura" }
cumulus-client-consensus-relay-chain = { path = "../client/consensus/relay-chain" }
cumulus-client-consensus-common = { path = "../client/consensus/common" }
cumulus-client-service = { path = "../client/service" }
-cumulus-client-network = { path = "../client/network" }
cumulus-primitives-core = { path = "../primitives/core" }
cumulus-primitives-parachain-inherent = { path = "../primitives/parachain-inherent" }
cumulus-relay-chain-interface = { path = "../client/relay-chain-interface" }
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 97c6ab1d1575589e30fc9d2125f21e9eff14850d..1c7ef7a3b1210a20e603d98eda62deb7c53b9e71 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -62,13 +62,11 @@ cumulus-client-cli = { path = "../../client/cli" }
parachains-common = { path = "../../parachains/common" }
cumulus-client-consensus-common = { path = "../../client/consensus/common" }
cumulus-client-consensus-relay-chain = { path = "../../client/consensus/relay-chain" }
-cumulus-client-network = { path = "../../client/network" }
cumulus-client-service = { path = "../../client/service" }
cumulus-primitives-core = { path = "../../primitives/core" }
cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
cumulus-relay-chain-inprocess-interface = { path = "../../client/relay-chain-inprocess-interface" }
cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface" }
-cumulus-relay-chain-rpc-interface = { path = "../../client/relay-chain-rpc-interface" }
cumulus-test-relay-validation-worker-provider = { path = "../relay-validation-worker-provider" }
cumulus-test-runtime = { path = "../runtime" }
cumulus-relay-chain-minimal-node = { path = "../../client/relay-chain-minimal-node" }