Move syncing code from sc-network-common to sc-network-sync (#1912)

This PR moves syncing-related code from `sc-network-common` to
`sc-network-sync`.

Unfortunately, some parts are tightly integrated with networking, so
they were left in `sc-network-common` for now:

1. `SyncMode` in `common/src/sync.rs` (used in `NetworkConfiguration`).
2. `BlockAnnouncesHandshake`, `BlockRequest`, `BlockResponse`, etc. in
`common/src/sync/message.rs` (used in `src/protocol.rs` and
`src/protocol/message.rs`).

More substantial refactoring is needed to decouple syncing and
networking completely, including getting rid of the hardcoded sync
protocol.

## Release notes

Move syncing-related code from `sc-network-common` to `sc-network-sync`.
Delete `ChainSync` trait as it's never used (the only implementation is
accessed directly from `SyncingEngine` and exposes a lot of public
methods that are not part of the trait). Some new trait(s) for syncing
will likely be introduced as part of Sync 2.0 refactoring to represent
syncing strategies.

substrate/client/network/sync/src/block_request_handler.rs

@@ -24,7 +24,6 @@ use crate::{
 		BlockResponse as BlockResponseSchema, BlockResponse, Direction,
 	},
 	service::network::NetworkServiceHandle,
-	MAX_BLOCKS_IN_RESPONSE,
 };
 
 use codec::{Decode, DecodeAll, Encode};
@@ -54,6 +53,9 @@ use std::{
 	time::Duration,
 };
 
+/// Maximum blocks per response.
+pub(crate) const MAX_BLOCKS_IN_RESPONSE: usize = 128;
+
 const LOG_TARGET: &str = "sync";
 const MAX_BODY_BYTES: usize = 8 * 1024 * 1024;
 const MAX_NUMBER_OF_SAME_REQUESTS_PER_PEER: usize = 2;

substrate/client/network/sync/src/engine.rs

@@ -24,12 +24,21 @@ use crate::{
 		BlockAnnounceValidationResult, BlockAnnounceValidator as BlockAnnounceValidatorStream,
 	},
 	block_relay_protocol::{BlockDownloader, BlockResponseError},
+	block_request_handler::MAX_BLOCKS_IN_RESPONSE,
+	chain_sync::{
+		BlockRequestAction, ChainSync, ImportBlocksAction, ImportJustificationsAction,
+		OnBlockResponse,
+	},
 	pending_responses::{PendingResponses, ResponseEvent},
 	schema::v1::{StateRequest, StateResponse},
-	service::{self, chain_sync::ToServiceCommand},
-	warp::WarpSyncParams,
-	BlockRequestAction, ChainSync, ClientError, ImportBlocksAction, ImportJustificationsAction,
-	OnBlockResponse, SyncingService,
+	service::{
+		self,
+		chain_sync::{SyncingService, ToServiceCommand},
+	},
+	types::{
+		BadPeer, ExtendedPeerInfo, OpaqueStateRequest, OpaqueStateResponse, PeerRequest, SyncEvent,
+	},
+	warp::{EncodedProof, WarpProofRequest, WarpSyncParams},
 };
 
 use codec::{Decode, Encode};
@@ -61,15 +70,10 @@ use sc_network::{
 };
 use sc_network_common::{
 	role::Roles,
-	sync::{
-		message::{BlockAnnounce, BlockAnnouncesHandshake, BlockRequest, BlockState},
-		warp::{EncodedProof, WarpProofRequest},
-		BadPeer, ChainSync as ChainSyncT, ExtendedPeerInfo, OpaqueStateRequest,
-		OpaqueStateResponse, PeerRequest, SyncEvent,
-	},
+	sync::message::{BlockAnnounce, BlockAnnouncesHandshake, BlockRequest, BlockState},
 };
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
-use sp_blockchain::HeaderMetadata;
+use sp_blockchain::{Error as ClientError, HeaderMetadata};
 use sp_consensus::block_validation::BlockAnnounceValidator;
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
 
@@ -363,18 +367,17 @@ where
 	) -> Result<(Self, SyncingService<B>, NonDefaultSetConfig), ClientError> {
 		let mode = net_config.network_config.sync_mode;
 		let max_parallel_downloads = net_config.network_config.max_parallel_downloads;
-		let max_blocks_per_request = if net_config.network_config.max_blocks_per_request >
-			crate::MAX_BLOCKS_IN_RESPONSE as u32
-		{
-			log::info!(
-				target: LOG_TARGET,
-				"clamping maximum blocks per request to {}",
-				crate::MAX_BLOCKS_IN_RESPONSE,
-			);
-			crate::MAX_BLOCKS_IN_RESPONSE as u32
-		} else {
-			net_config.network_config.max_blocks_per_request
-		};
+		let max_blocks_per_request =
+			if net_config.network_config.max_blocks_per_request > MAX_BLOCKS_IN_RESPONSE as u32 {
+				log::info!(
+					target: LOG_TARGET,
+					"clamping maximum blocks per request to {}",
+					MAX_BLOCKS_IN_RESPONSE,
+				);
+				MAX_BLOCKS_IN_RESPONSE as u32
+			} else {
+				net_config.network_config.max_blocks_per_request
+			};
 		let cache_capacity = (net_config.network_config.default_peers_set.in_peers +
 			net_config.network_config.default_peers_set.out_peers)
 			.max(1);

substrate/client/network/sync/src/extra_requests.rs

@@ -16,11 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{PeerSync, PeerSyncState};
+use crate::{
+	chain_sync::{PeerSync, PeerSyncState},
+	request_metrics::Metrics,
+};
 use fork_tree::ForkTree;
 use libp2p::PeerId;
 use log::{debug, trace, warn};
-use sc_network_common::sync::metrics::Metrics;
 use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, NumberFor, Zero};
 use std::{
@@ -343,7 +345,7 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::PeerSync;
+	use crate::chain_sync::PeerSync;
 	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use sp_blockchain::Error as ClientError;
 	use sp_test_primitives::{Block, BlockNumber, Hash};

substrate/client/network/sync/src/mock.rs

@@ -23,65 +23,8 @@ use crate::block_relay_protocol::{BlockDownloader as BlockDownloaderT, BlockResp
 use futures::channel::oneshot;
 use libp2p::PeerId;
 use sc_network::RequestFailure;
-use sc_network_common::sync::{
-	message::{BlockAnnounce, BlockData, BlockRequest, BlockResponse},
-	BadPeer, ChainSync as ChainSyncT, ImportBlocksAction, Metrics, OnBlockData,
-	OnBlockJustification, PeerInfo, SyncStatus,
-};
-use sp_runtime::traits::{Block as BlockT, NumberFor};
-
-mockall::mock! {
-	pub ChainSync<Block: BlockT> {}
-
-	impl<Block: BlockT> ChainSyncT<Block> for ChainSync<Block> {
-		fn peer_info(&self, who: &PeerId) -> Option<PeerInfo<Block>>;
-		fn status(&self) -> SyncStatus<Block>;
-		fn num_sync_requests(&self) -> usize;
-		fn num_downloaded_blocks(&self) -> usize;
-		fn num_peers(&self) -> usize;
-		fn new_peer(
-			&mut self,
-			who: PeerId,
-			best_hash: Block::Hash,
-			best_number: NumberFor<Block>,
-		) -> Result<Option<BlockRequest<Block>>, BadPeer>;
-		fn update_chain_info(&mut self, best_hash: &Block::Hash, best_number: NumberFor<Block>);
-		fn request_justification(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-		fn clear_justification_requests(&mut self);
-		fn set_sync_fork_request(
-			&mut self,
-			peers: Vec<PeerId>,
-			hash: &Block::Hash,
-			number: NumberFor<Block>,
-		);
-		fn on_block_data(
-			&mut self,
-			who: &PeerId,
-			request: Option<BlockRequest<Block>>,
-			response: BlockResponse<Block>,
-		) -> Result<OnBlockData<Block>, BadPeer>;
-		fn on_block_justification(
-			&mut self,
-			who: PeerId,
-			response: BlockResponse<Block>,
-		) -> Result<OnBlockJustification<Block>, BadPeer>;
-		fn on_justification_import(
-			&mut self,
-			hash: Block::Hash,
-			number: NumberFor<Block>,
-			success: bool,
-		);
-		fn on_block_finalized(&mut self, hash: &Block::Hash, number: NumberFor<Block>);
-		fn on_validated_block_announce(
-			&mut self,
-			is_best: bool,
-			who: PeerId,
-			announce: &BlockAnnounce<Block::Header>,
-		);
-		fn peer_disconnected(&mut self, who: &PeerId) -> Option<ImportBlocksAction<Block>>;
-		fn metrics(&self) -> Metrics;
-	}
-}
+use sc_network_common::sync::message::{BlockData, BlockRequest};
+use sp_runtime::traits::Block as BlockT;
 
 mockall::mock! {
 	pub BlockDownloader<Block: BlockT> {}

substrate/client/network/sync/src/pending_responses.rs

@@ -19,6 +19,7 @@
 //! [`PendingResponses`] is responsible for keeping track of pending responses and
 //! polling them.
 
+use crate::types::PeerRequest;
 use futures::{
 	channel::oneshot,
 	future::BoxFuture,
@@ -28,11 +29,13 @@ use futures::{
 use libp2p::PeerId;
 use log::error;
 use sc_network::request_responses::RequestFailure;
-use sc_network_common::sync::PeerRequest;
 use sp_runtime::traits::Block as BlockT;
 use std::task::{Context, Poll};
 use tokio_stream::StreamMap;
 
+/// Log target for this file.
+const LOG_TARGET: &'static str = "sync";
+
 /// Response result.
 type ResponseResult = Result<Result<Vec<u8>, RequestFailure>, oneshot::Canceled>;
 
@@ -74,7 +77,7 @@ impl<B: BlockT> PendingResponses<B> {
 			.is_some()
 		{
 			error!(
-				target: crate::LOG_TARGET,
+				target: LOG_TARGET,
 				"Discarded pending response from peer {peer_id}, request type: {request_type:?}.",
 			);
 			debug_assert!(false);

substrate/client/network/sync/src/request_metrics.rs

@@ -0,0 +1,25 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#[derive(Debug)]
+pub struct Metrics {
+	pub pending_requests: u32,
+	pub active_requests: u32,
+	pub importing_requests: u32,
+	pub failed_requests: u32,
+}

substrate/client/network/sync/src/service/chain_sync.rs

@@ -16,14 +16,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use crate::types::{ExtendedPeerInfo, SyncEvent, SyncEventStream, SyncStatus, SyncStatusProvider};
+
 use futures::{channel::oneshot, Stream};
 use libp2p::PeerId;
 
 use sc_consensus::{BlockImportError, BlockImportStatus, JustificationSyncLink, Link};
 use sc_network::{NetworkBlock, NetworkSyncForkRequest};
-use sc_network_common::sync::{
-	ExtendedPeerInfo, SyncEvent, SyncEventStream, SyncStatus, SyncStatusProvider,
-};
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 

substrate/client/network/sync/src/state.rs

@@ -18,12 +18,14 @@
 
 //! State sync support.
 
-use crate::schema::v1::{StateEntry, StateRequest, StateResponse};
+use crate::{
+	schema::v1::{StateEntry, StateRequest, StateResponse},
+	types::StateDownloadProgress,
+};
 use codec::{Decode, Encode};
 use log::debug;
 use sc_client_api::{CompactProof, ProofProvider};
 use sc_consensus::ImportedState;
-use sc_network_common::sync::StateDownloadProgress;
 use smallvec::SmallVec;
 use sp_core::storage::well_known_keys;
 use sp_runtime::{

substrate/client/network/sync/src/types.rs

@@ -0,0 +1,206 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Common syncing types.
+
+use futures::Stream;
+use sc_network_common::{role::Roles, types::ReputationChange};
+
+use libp2p::PeerId;
+
+use crate::warp::WarpSyncProgress;
+use sc_network_common::sync::message::BlockRequest;
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+
+use std::{any::Any, fmt, fmt::Formatter, pin::Pin, sync::Arc};
+
+pub use sc_network_common::sync::SyncMode;
+
+/// The sync status of a peer we are trying to sync with
+#[derive(Debug)]
+pub struct PeerInfo<Block: BlockT> {
+	/// Their best block hash.
+	pub best_hash: Block::Hash,
+	/// Their best block number.
+	pub best_number: NumberFor<Block>,
+}
+
+/// Info about a peer's known state (both full and light).
+#[derive(Clone, Debug)]
+pub struct ExtendedPeerInfo<B: BlockT> {
+	/// Roles
+	pub roles: Roles,
+	/// Peer best block hash
+	pub best_hash: B::Hash,
+	/// Peer best block number
+	pub best_number: NumberFor<B>,
+}
+
+/// Reported sync state.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum SyncState<BlockNumber> {
+	/// Initial sync is complete, keep-up sync is active.
+	Idle,
+	/// Actively catching up with the chain.
+	Downloading { target: BlockNumber },
+	/// All blocks are downloaded and are being imported.
+	Importing { target: BlockNumber },
+}
+
+impl<BlockNumber> SyncState<BlockNumber> {
+	/// Are we actively catching up with the chain?
+	pub fn is_major_syncing(&self) -> bool {
+		!matches!(self, SyncState::Idle)
+	}
+}
+
+/// Reported state download progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct StateDownloadProgress {
+	/// Estimated download percentage.
+	pub percentage: u32,
+	/// Total state size in bytes downloaded so far.
+	pub size: u64,
+}
+
+/// Syncing status and statistics.
+#[derive(Debug, Clone)]
+pub struct SyncStatus<Block: BlockT> {
+	/// Current global sync state.
+	pub state: SyncState<NumberFor<Block>>,
+	/// Target sync block number.
+	pub best_seen_block: Option<NumberFor<Block>>,
+	/// Number of peers participating in syncing.
+	pub num_peers: u32,
+	/// Number of peers known to `SyncingEngine` (both full and light).
+	pub num_connected_peers: u32,
+	/// Number of blocks queued for import
+	pub queued_blocks: u32,
+	/// State sync status in progress, if any.
+	pub state_sync: Option<StateDownloadProgress>,
+	/// Warp sync in progress, if any.
+	pub warp_sync: Option<WarpSyncProgress<Block>>,
+}
+
+/// A peer did not behave as expected and should be reported.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BadPeer(pub PeerId, pub ReputationChange);
+
+impl fmt::Display for BadPeer {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		write!(f, "Bad peer {}; Reputation change: {:?}", self.0, self.1)
+	}
+}
+
+impl std::error::Error for BadPeer {}
+
+#[derive(Debug)]
+pub struct Metrics {
+	pub queued_blocks: u32,
+	pub fork_targets: u32,
+	pub justifications: crate::request_metrics::Metrics,
+}
+
+#[derive(Debug)]
+pub enum PeerRequest<B: BlockT> {
+	Block(BlockRequest<B>),
+	State,
+	WarpProof,
+}
+
+#[derive(Debug)]
+pub enum PeerRequestType {
+	Block,
+	State,
+	WarpProof,
+}
+
+impl<B: BlockT> PeerRequest<B> {
+	pub fn get_type(&self) -> PeerRequestType {
+		match self {
+			PeerRequest::Block(_) => PeerRequestType::Block,
+			PeerRequest::State => PeerRequestType::State,
+			PeerRequest::WarpProof => PeerRequestType::WarpProof,
+		}
+	}
+}
+
+/// Wrapper for implementation-specific state request.
+///
+/// NOTE: Implementation must be able to encode and decode it for network purposes.
+pub struct OpaqueStateRequest(pub Box<dyn Any + Send>);
+
+impl fmt::Debug for OpaqueStateRequest {
+	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+		f.debug_struct("OpaqueStateRequest").finish()
+	}
+}
+
+/// Wrapper for implementation-specific state response.
+///
+/// NOTE: Implementation must be able to encode and decode it for network purposes.
+pub struct OpaqueStateResponse(pub Box<dyn Any + Send>);
+
+impl fmt::Debug for OpaqueStateResponse {
+	fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+		f.debug_struct("OpaqueStateResponse").finish()
+	}
+}
+
+/// Provides high-level status of syncing.
+#[async_trait::async_trait]
+pub trait SyncStatusProvider<Block: BlockT>: Send + Sync {
+	/// Get high-level view of the syncing status.
+	async fn status(&self) -> Result<SyncStatus<Block>, ()>;
+}
+
+#[async_trait::async_trait]
+impl<T, Block> SyncStatusProvider<Block> for Arc<T>
+where
+	T: ?Sized,
+	T: SyncStatusProvider<Block>,
+	Block: BlockT,
+{
+	async fn status(&self) -> Result<SyncStatus<Block>, ()> {
+		T::status(self).await
+	}
+}
+
+/// Syncing-related events that other protocols can subscribe to.
+pub enum SyncEvent {
+	/// Peer that the syncing implementation is tracking connected.
+	PeerConnected(PeerId),
+
+	/// Peer that the syncing implementation was tracking disconnected.
+	PeerDisconnected(PeerId),
+}
+
+pub trait SyncEventStream: Send + Sync {
+	/// Subscribe to syncing-related events.
+	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>>;
+}
+
+impl<T> SyncEventStream for Arc<T>
+where
+	T: ?Sized,
+	T: SyncEventStream,
+{
+	fn event_stream(&self, name: &'static str) -> Pin<Box<dyn Stream<Item = SyncEvent> + Send>> {
+		T::event_stream(self, name)
+	}
+}

substrate/client/network/sync/src/warp.rs

@@ -18,28 +18,107 @@
 
 //! Warp sync support.
 
+pub use sp_consensus_grandpa::{AuthorityList, SetId};
+
 use crate::{
 	schema::v1::{StateRequest, StateResponse},
 	state::{ImportResult, StateSync},
 };
+use codec::{Decode, Encode};
 use futures::channel::oneshot;
 use log::error;
 use sc_client_api::ProofProvider;
-use sc_network_common::sync::{
-	message::{BlockAttributes, BlockData, BlockRequest, Direction, FromBlock},
-	warp::{
-		EncodedProof, VerificationResult, WarpProofRequest, WarpSyncPhase, WarpSyncProgress,
-		WarpSyncProvider,
-	},
+use sc_network_common::sync::message::{
+	BlockAttributes, BlockData, BlockRequest, Direction, FromBlock,
 };
 use sp_blockchain::HeaderBackend;
-use sp_consensus_grandpa::{AuthorityList, SetId};
 use sp_runtime::traits::{Block as BlockT, Header, NumberFor, Zero};
-use std::sync::Arc;
+use std::{fmt, sync::Arc};
 
 /// Log target for this file.
 const LOG_TARGET: &'static str = "sync";
 
+/// Scale-encoded warp sync proof response.
+pub struct EncodedProof(pub Vec<u8>);
+
+/// Warp sync request
+#[derive(Encode, Decode, Debug)]
+pub struct WarpProofRequest<B: BlockT> {
+	/// Start collecting proofs from this block.
+	pub begin: B::Hash,
+}
+
+/// Proof verification result.
+pub enum VerificationResult<Block: BlockT> {
+	/// Proof is valid, but the target was not reached.
+	Partial(SetId, AuthorityList, Block::Hash),
+	/// Target finality is proved.
+	Complete(SetId, AuthorityList, Block::Header),
+}
+
+/// Warp sync backend. Handles retrieving and verifying warp sync proofs.
+pub trait WarpSyncProvider<Block: BlockT>: Send + Sync {
+	/// Generate proof starting at given block hash. The proof is accumulated until maximum proof
+	/// size is reached.
+	fn generate(
+		&self,
+		start: Block::Hash,
+	) -> Result<EncodedProof, Box<dyn std::error::Error + Send + Sync>>;
+	/// Verify warp proof against current set of authorities.
+	fn verify(
+		&self,
+		proof: &EncodedProof,
+		set_id: SetId,
+		authorities: AuthorityList,
+	) -> Result<VerificationResult<Block>, Box<dyn std::error::Error + Send + Sync>>;
+	/// Get current list of authorities. This is supposed to be genesis authorities when starting
+	/// sync.
+	fn current_authorities(&self) -> AuthorityList;
+}
+
+/// Reported warp sync phase.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum WarpSyncPhase<Block: BlockT> {
+	/// Waiting for peers to connect.
+	AwaitingPeers { required_peers: usize },
+	/// Waiting for target block to be received.
+	AwaitingTargetBlock,
+	/// Downloading and verifying grandpa warp proofs.
+	DownloadingWarpProofs,
+	/// Downloading target block.
+	DownloadingTargetBlock,
+	/// Downloading state data.
+	DownloadingState,
+	/// Importing state.
+	ImportingState,
+	/// Downloading block history.
+	DownloadingBlocks(NumberFor<Block>),
+}
+
+impl<Block: BlockT> fmt::Display for WarpSyncPhase<Block> {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			Self::AwaitingPeers { required_peers } =>
+				write!(f, "Waiting for {required_peers} peers to be connected"),
+			Self::AwaitingTargetBlock => write!(f, "Waiting for target block to be received"),
+			Self::DownloadingWarpProofs => write!(f, "Downloading finality proofs"),
+			Self::DownloadingTargetBlock => write!(f, "Downloading target block"),
+			Self::DownloadingState => write!(f, "Downloading state"),
+			Self::ImportingState => write!(f, "Importing state"),
+			Self::DownloadingBlocks(n) => write!(f, "Downloading block history (#{})", n),
+		}
+	}
+}
+
+/// Reported warp sync progress.
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub struct WarpSyncProgress<Block: BlockT> {
+	/// Estimated download percentage.
+	pub phase: WarpSyncPhase<Block>,
+	/// Total bytes downloaded so far.
+	pub total_bytes: u64,
+}
+
 /// The different types of warp syncing, passed to `build_network`.
 pub enum WarpSyncParams<Block: BlockT> {
 	/// Standard warp sync for the chain.

substrate/client/network/sync/src/warp_request_handler.rs

@@ -20,13 +20,13 @@ use codec::Decode;
 use futures::{channel::oneshot, stream::StreamExt};
 use log::debug;
 
+use crate::warp::{EncodedProof, WarpProofRequest, WarpSyncProvider};
 use sc_network::{
 	config::ProtocolId,
 	request_responses::{
 		IncomingRequest, OutgoingResponse, ProtocolConfig as RequestResponseConfig,
 	},
 };
-use sc_network_common::sync::warp::{EncodedProof, WarpProofRequest, WarpSyncProvider};
 use sp_runtime::traits::Block as BlockT;
 
 use std::{sync::Arc, time::Duration};