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 <>
This commit is contained in:
Aaro Altonen
2023-03-14 16:34:20 +02:00
committed by GitHub
parent e484103293
commit d57f0f415c
11 changed files with 281 additions and 284 deletions
@@ -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};
@@ -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};