From c899685cb230bd0d1747e66169739c9977d86bb4 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Tue, 8 Feb 2022 14:58:50 -0700
Subject: [PATCH] chore: make Connection block tests less brittle (#23015)

---
 web3.js/test/connection.test.ts | 39 +++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/web3.js/test/connection.test.ts b/web3.js/test/connection.test.ts
index e0da0568c..6e3732687 100644
--- a/web3.js/test/connection.test.ts
+++ b/web3.js/test/connection.test.ts
@@ -1973,14 +1973,21 @@ describe('Connection', () => {
       },
     });
 
-    // Find a block that has a transaction, usually Block 1
+    // Find a block that has a transaction
+    // Compare data with parent
     let x = 1;
     while (x < 10) {
       const block1 = await connection.getBlock(x);
       if (block1 && block1.transactions.length >= 1) {
-        expect(block1.previousBlockhash).to.eq(blockhash0);
+        if (block1.parentSlot == 0) {
+          expect(block1.previousBlockhash).to.eq(blockhash0);
+        } else {
+          const parentBlock = await connection.getBlock(block1.parentSlot);
+          if (parentBlock) {
+            expect(block1.previousBlockhash).to.eq(parentBlock.blockhash);
+          }
+        }
         expect(block1.blockhash).not.to.be.null;
-        expect(block1.parentSlot).to.eq(0);
         expect(block1.transactions[0].transaction).not.to.be.null;
         break;
       }
@@ -2082,14 +2089,21 @@ describe('Connection', () => {
       },
     });
 
-    // Find a block that has a transaction, usually Block 1
+    // Find a block that has a transaction
+    // Compare data with parent
     let x = 1;
     while (x < 10) {
       const block1 = await connection.getConfirmedBlock(x);
       if (block1.transactions.length >= 1) {
-        expect(block1.previousBlockhash).to.eq(blockhash0);
+        if (block1.parentSlot == 0) {
+          expect(block1.previousBlockhash).to.eq(blockhash0);
+        } else {
+          const parentBlock = await connection.getBlock(block1.parentSlot);
+          if (parentBlock) {
+            expect(block1.previousBlockhash).to.eq(parentBlock.blockhash);
+          }
+        }
         expect(block1.blockhash).not.to.be.null;
-        expect(block1.parentSlot).to.eq(0);
         expect(block1.transactions[0].transaction).not.to.be.null;
         break;
       }
@@ -2219,14 +2233,21 @@ describe('Connection', () => {
       },
     });
 
-    // Find a block that has a transaction, usually Block 1
+    // Find a block that has a transaction
+    // Compare data with parent
     let x = 1;
     while (x < 10) {
       const block1 = await connection.getBlockSignatures(x);
       if (block1.signatures.length >= 1) {
-        expect(block1.previousBlockhash).to.eq(blockhash0);
+        if (block1.parentSlot == 0) {
+          expect(block1.previousBlockhash).to.eq(blockhash0);
+        } else {
+          const parentBlock = await connection.getBlock(block1.parentSlot);
+          if (parentBlock) {
+            expect(block1.previousBlockhash).to.eq(parentBlock.blockhash);
+          }
+        }
         expect(block1.blockhash).not.to.be.null;
-        expect(block1.parentSlot).to.eq(0);
         expect(block1.signatures[0]).not.to.be.null;
         expect(block1).to.not.have.property('rewards');
         break;