Use number of downloaded blocks for test (#6234)

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

@@ -189,8 +189,8 @@ pub struct ChainSync<B: BlockT> {
 	block_announce_validator: Box<dyn BlockAnnounceValidator<B> + Send>,
 	/// Maximum number of peers to ask the same blocks in parallel.
 	max_parallel_downloads: u32,
-	/// Total number of processed blocks (imported or failed).
-	processed_blocks: usize,
+	/// Total number of downloaded blocks.
+	downloaded_blocks: usize,
 }
 
 /// All the data we have about a Peer that we are trying to sync with
@@ -375,7 +375,7 @@ impl<B: BlockT> ChainSync<B> {
 			pending_requests: Default::default(),
 			block_announce_validator,
 			max_parallel_downloads,
-			processed_blocks: 0,
+			downloaded_blocks: 0,
 		}
 	}
 
@@ -415,9 +415,9 @@ impl<B: BlockT> ChainSync<B> {
 		self.fork_targets.len()
 	}
 
-	/// Number of processed blocks.
-	pub fn num_processed_blocks(&self) -> usize {
-		self.processed_blocks
+	/// Number of downloaded blocks.
+	pub fn num_downloaded_blocks(&self) -> usize {
+		self.downloaded_blocks
 	}
 
 	/// Handle a new connected peer.
@@ -719,6 +719,7 @@ impl<B: BlockT> ChainSync<B> {
 		request: Option<BlockRequest<B>>,
 		response: BlockResponse<B>
 	) -> Result<OnBlockData<B>, BadPeer> {
+		self.downloaded_blocks += response.blocks.len();
 		let mut new_blocks: Vec<IncomingBlock<B>> =
 			if let Some(peer) = self.peers.get_mut(who) {
 				let mut blocks = response.blocks;
@@ -1004,8 +1005,6 @@ impl<B: BlockT> ChainSync<B> {
 		for (_, hash) in &results {
 			self.queue_blocks.remove(&hash);
 		}
-		self.processed_blocks += results.len();
-
 		for (result, hash) in results {
 			if has_error {
 				continue;
@@ -1274,7 +1273,6 @@ impl<B: BlockT> ChainSync<B> {
 
 	/// Restart the sync process.
 	fn restart<'a>(&'a mut self) -> impl Iterator<Item = Result<(PeerId, BlockRequest<B>), BadPeer>> + 'a {
-		self.processed_blocks = 0;
 		self.blocks.clear();
 		let info = self.client.info();
 		self.best_queued_hash = info.best_hash;