Fix counter increment and test

client/consensus/common/src/level_monitor.rs

@@ -109,16 +109,18 @@ where
 		self.import_counter = info.finalized_number;
 
 		for leaf in self.backend.blockchain().leaves().unwrap_or_default() {
-			let mut info = self.backend.blockchain().header_metadata(leaf).expect(ERR_MSG);
+			let mut meta = self.backend.blockchain().header_metadata(leaf).expect(ERR_MSG);
 
-			self.import_counter = self.import_counter.max(info.number);
+			self.import_counter = self.import_counter.max(meta.number);
 
 			// Populate the monitor until we don't hit an already imported branch
-			// or the block number is below the last finalized block number.
-			while info.number >= self.lowest_level && !self.freshness.contains_key(&info.hash) {
-				self.freshness.insert(info.hash, info.number);
-				self.levels.entry(info.number).or_default().insert(info.hash);
-				info = self.backend.blockchain().header_metadata(info.parent).expect(ERR_MSG);
+			while !self.freshness.contains_key(&meta.hash) {
+				self.freshness.insert(meta.hash, meta.number);
+				self.levels.entry(meta.number).or_default().insert(meta.hash);
+				if meta.number <= self.lowest_level {
+					break
+				}
+				meta = self.backend.blockchain().header_metadata(meta.parent).expect(ERR_MSG);
 			}
 		}
 
@@ -349,9 +351,9 @@ where
 
 	/// Add a new imported block information to the monitor.
 	pub fn block_imported(&mut self, number: NumberFor<Block>, hash: Block::Hash) {
+		self.import_counter += One::one();
 		self.freshness.insert(hash, self.import_counter);
 		self.levels.entry(number).or_default().insert(hash);
-		self.import_counter += One::one();
 
 		// Do cleanup once in a while, we are allowed to have some obsolete information.
 		let finalized_num = self.backend.blockchain().info().finalized_number;

client/consensus/common/src/tests.rs

@@ -765,6 +765,12 @@ fn restore_limit_monitor() {
 		LevelLimit::Some(LEVEL_LIMIT),
 	);
 
+	let monitor_sd = para_import.monitor.clone().unwrap();
+
+	let monitor = monitor_sd.shared_data();
+	assert_eq!(monitor.import_counter, 3);
+	std::mem::drop(monitor);
+
 	let block13 = build_and_import_block_ext(
 		&*client,
 		BlockOrigin::Own,
@@ -783,14 +789,13 @@ fn restore_limit_monitor() {
 	let expected = vec![blocks1[1].header.hash(), block13.header.hash()];
 	assert_eq!(leaves, expected);
 
-	let monitor = para_import.monitor.unwrap();
-	let monitor = monitor.shared_data();
-	assert_eq!(monitor.import_counter, 5);
+	let monitor = monitor_sd.shared_data();
+	assert_eq!(monitor.import_counter, 4);
 	assert!(monitor.levels.iter().all(|(number, hashes)| {
 		hashes
 			.iter()
 			.filter(|hash| **hash != block13.header.hash())
 			.all(|hash| *number == *monitor.freshness.get(hash).unwrap())
 	}));
-	assert_eq!(*monitor.freshness.get(&block13.header.hash()).unwrap(), monitor.import_counter - 1);
+	assert_eq!(*monitor.freshness.get(&block13.header.hash()).unwrap(), monitor.import_counter);
 }