From 6de543538cdfba988639a21133457cc09ee25c00 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Fri, 7 Aug 2020 21:21:24 +0200
Subject: [PATCH] Fix `wait_for_blocks` counting blocks that didn't go through
 consensus (#6850)

* Initial commit

Forked at: cde60b871e810a8fefe70d7f8e5487a33a9a73a7
Parent branch: origin/master

* WIP

Forked at: cde60b871e810a8fefe70d7f8e5487a33a9a73a7
Parent branch: origin/master
---
 substrate/test-utils/client/src/lib.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/substrate/test-utils/client/src/lib.rs b/substrate/test-utils/client/src/lib.rs
index 060d487967..f64e7e3cfb 100644
--- a/substrate/test-utils/client/src/lib.rs
+++ b/substrate/test-utils/client/src/lib.rs
@@ -384,9 +384,11 @@ where
 
 		Box::pin(async move {
 			while let Some(notification) = import_notification_stream.next().await {
-				blocks.insert(notification.hash);
-				if blocks.len() == count {
-					break;
+				if notification.is_new_best {
+					blocks.insert(notification.hash);
+					if blocks.len() == count {
+						break;
+					}
 				}
 			}
 		})