Companion for paritytech/substrate#13592 (#2310)

* Fixes

* Remove `sc-network-common` dependency

* update lockfile for {"polkadot", "substrate"}

* Update Cargo.lock

* Update Cargo.lock

---------

Co-authored-by: parity-processbot <>

client/relay-chain-minimal-node/src/lib.rs

@@ -28,8 +28,7 @@ use polkadot_node_subsystem_util::metrics::prometheus::Registry;
 use polkadot_primitives::CollatorPair;
 
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
-use sc_network::{Event, NetworkService};
-use sc_network_common::service::NetworkEventStream;
+use sc_network::{Event, NetworkEventStream, NetworkService};
 use sc_service::{Configuration, TaskManager};
 use sp_runtime::{app_crypto::Pair, traits::Block as BlockT};
 

client/relay-chain-minimal-node/src/network.rs

@@ -17,16 +17,15 @@
 use polkadot_core_primitives::{Block, Hash};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 
-use sc_network::NetworkService;
-
-use sc_client_api::HeaderBackend;
-use sc_network_common::{
+use sc_network::{
 	config::{
 		NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake, ProtocolId, SetConfig,
 	},
-	protocol::role::Roles,
-	sync::message::BlockAnnouncesHandshake,
+	NetworkService,
 };
+
+use sc_client_api::HeaderBackend;
+use sc_network_common::{role::Roles, sync::message::BlockAnnouncesHandshake};
 use sc_service::{error::Error, Configuration, NetworkStarter, SpawnTaskHandle};
 
 use std::{iter, sync::Arc};

client/service/Cargo.toml

@@ -16,7 +16,6 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
 sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-telemetry = { 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-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-network-transactions = { git = "https://github.com/paritytech/substrate", branch = "master" }

client/service/src/lib.rs

@@ -38,8 +38,7 @@ use sc_consensus::{
 	import_queue::{ImportQueue, ImportQueueService},
 	BlockImport,
 };
-use sc_network::NetworkService;
-use sc_network_common::config::SyncMode;
+use sc_network::{config::SyncMode, NetworkService};
 use sc_network_sync::SyncingService;
 use sc_network_transactions::TransactionsHandlerController;
 use sc_service::{Configuration, NetworkStarter, SpawnTaskHandle, TaskManager, WarpSyncParams};