From e3e2b8151c9cb71889ffb061058f046d85ea2e31 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Mon, 20 Jun 2022 12:07:57 +0200
Subject: [PATCH] Make Tendermint 0.35 block header test independent of block
 count

---
 .../src/tendermint35/tendermint35client.spec.ts            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/tendermint-rpc/src/tendermint35/tendermint35client.spec.ts b/packages/tendermint-rpc/src/tendermint35/tendermint35client.spec.ts
index 96058c40..833ec0c3 100644
--- a/packages/tendermint-rpc/src/tendermint35/tendermint35client.spec.ts
+++ b/packages/tendermint-rpc/src/tendermint35/tendermint35client.spec.ts
@@ -648,10 +648,6 @@ function websocketTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValue
         expect(event.header.validatorsHash).toBeTruthy();
 
         events.push(event);
-
-        if (events.length === 3) {
-          subscription.unsubscribe();
-        }
       },
       error: fail,
     });
@@ -662,6 +658,9 @@ function websocketTestSuite(rpcFactory: () => RpcClient, expected: ExpectedValue
     // wait for events to be processed
     await sleep(100);
 
+    // Stop listening for new blocks
+    subscription.unsubscribe();
+
     // We don't know exactly in which block the transactions are added. So we look into those
     // with txs.
     const eventsWithTx = events.filter((e) => e.txs.length > 0);