From e2e2900a0af8831df99572beaf477f03040697dc Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 22 May 2023 19:24:52 +0800
Subject: [PATCH] Companion of paritytech/substrate#13592

---
 Cargo.lock              | 3 +--
 Cargo.toml              | 4 +---
 node/Cargo.toml         | 3 +--
 node/src/service/mod.rs | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed56affdf..6f859418c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2447,7 +2447,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",
@@ -2484,7 +2483,7 @@ dependencies = [
  "sc-consensus",
  "sc-consensus-aura",
  "sc-executor",
- "sc-network-common",
+ "sc-network",
  "sc-network-sync",
  "sc-offchain",
  "sc-rpc",
diff --git a/Cargo.toml b/Cargo.toml
index e933f8cef..210d55758 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,6 @@ cumulus-client-cli                    = { git = "https://github.com/paritytech/c
 cumulus-client-collator               = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" }
 cumulus-client-consensus-aura         = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" }
 cumulus-client-consensus-common       = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" }
-cumulus-client-network                = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" }
 cumulus-client-service                = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40" }
 cumulus-pallet-aura-ext               = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40", default-features = false }
 cumulus-pallet-dmp-queue              = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.40", default-features = false }
@@ -120,7 +119,6 @@ polkadot-cli            = { git = "https://github.com/paritytech/polkadot", bran
 polkadot-parachain      = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
 polkadot-primitives     = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
 polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
-polkadot-service        = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" }
 xcm                     = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
 xcm-builder             = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
 xcm-executor            = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40", default-features = false }
@@ -164,7 +162,7 @@ sc-consensus                               = { git = "https://github.com/parityt
 sc-consensus-aura                          = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 sc-executor                                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 sc-keystore                                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
-sc-network-common                          = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
+sc-network                                 = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 sc-network-sync                            = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 sc-offchain                                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 sc-rpc                                     = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
diff --git a/node/Cargo.toml b/node/Cargo.toml
index ae44e9b25..8621e418e 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -26,7 +26,6 @@ trauma      = { version = "2.2" }
 cumulus-client-cli                    = { workspace = true }
 cumulus-client-consensus-aura         = { workspace = true }
 cumulus-client-consensus-common       = { workspace = true }
-cumulus-client-network                = { workspace = true }
 cumulus-client-service                = { workspace = true }
 cumulus-primitives-core               = { workspace = true, features = ["std"] }
 cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] }
@@ -71,7 +70,7 @@ sc-client-api                  = { workspace = true }
 sc-consensus                   = { workspace = true }
 sc-consensus-aura              = { workspace = true }
 sc-executor                    = { workspace = true }
-sc-network-common              = { workspace = true }
+sc-network                     = { workspace = true }
 sc-network-sync                = { workspace = true }
 sc-offchain                    = { workspace = true }
 sc-rpc                         = { workspace = true }
diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 30f31cf93..5a1890e48 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -44,7 +44,7 @@ use dc_primitives::*;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 // substrate
 use sc_consensus::ImportQueue;
-use sc_network_common::service::NetworkBlock;
+use sc_network::NetworkBlock;
 use sp_core::Pair;
 use sp_runtime::app_crypto::AppKey;