From adfc1ef5d11b859a8edec7216ec70a1986922dfe Mon Sep 17 00:00:00 2001
From: David Zhou <david.zhou.0110@gmail.com>
Date: Fri, 9 May 2025 13:05:40 -0400
Subject: [PATCH] TEST: All unit tests for concurrency pass

---
 eth/tracers/firehose.go                  | 12 ++++++------
 eth/tracers/firehose_concurrency_test.go |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eth/tracers/firehose.go b/eth/tracers/firehose.go
index a1be26f862..a278983eb5 100644
--- a/eth/tracers/firehose.go
+++ b/eth/tracers/firehose.go
@@ -495,13 +495,13 @@ func (f *Firehose) OnBlockEnd(err error) {
 			f.fixOrdinalsForEndOfBlockChanges()
 		}
 
+		// f.printBlockToFirehose(f.block, f.blockFinality)
 		f.ensureInBlockAndNotInTrx()
-		f.printBlockToFirehose(f.block, f.blockFinality)
-		//job := &blockPrintJob{
-		//	block:    f.block,
-		//	finality: f.blockFinality,
-		//}
-		//f.blockPrintQueue <- job
+		job := &blockPrintJob{
+			block:    f.block,
+			finality: f.blockFinality,
+		}
+		f.blockPrintQueue <- job
 
 	} else {
 		// An error occurred, could have happen in transaction/call context, we must not check if in trx/call, only check in block
diff --git a/eth/tracers/firehose_concurrency_test.go b/eth/tracers/firehose_concurrency_test.go
index ee108f385e..2bc3220d41 100644
--- a/eth/tracers/firehose_concurrency_test.go
+++ b/eth/tracers/firehose_concurrency_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 )
 
-func TestFirehose_BlockPrintsToFirehoseInOrder(t *testing.T) {
+func TestFirehose_BlockPrintsToFirehose_SingleBlock(t *testing.T) {
 	f := NewFirehose(&FirehoseConfig{
 		ApplyBackwardCompatibility: ptr(false),
 		private: &privateFirehoseConfig{
@@ -38,6 +38,8 @@ func TestFirehose_BlockPrintsToFirehoseInOrder(t *testing.T) {
 		f.OnBlockEnd(nil)
 	}
 
+	f.Shutdown()
+
 	output := f.InternalTestingBuffer().String()
 
 	require.Contains(t, output, "FIRE BLOCK", "expected FIRE BLOCK output not found")
@@ -59,7 +61,7 @@ func TestFirehose_BlockPrintsToFirehoseInOrder(t *testing.T) {
 		"Block 124 should appear before block 125 in output")
 }
 
-func TestFirehose_BlocksPrintToFirehoseInOrder(t *testing.T) {
+func TestFirehose_BlocksPrintToFirehose_MultipleBlocksInOrder(t *testing.T) {
 
 	const blockCount = 100
 	const baseBlockNum = 1000