From a1e2e8f2915f5d85a0bd245fbc2b4910bdc58eea Mon Sep 17 00:00:00 2001 From: David Zhou Date: Tue, 13 May 2025 15:24:48 -0400 Subject: [PATCH] PR: Part 2 --- .../tracetest/firehose/firehose_test.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/eth/tracers/internal/tracetest/firehose/firehose_test.go b/eth/tracers/internal/tracetest/firehose/firehose_test.go index 6379b6be3f..bbc1d1ed5d 100644 --- a/eth/tracers/internal/tracetest/firehose/firehose_test.go +++ b/eth/tracers/internal/tracetest/firehose/firehose_test.go @@ -1,6 +1,7 @@ package firehose_test import ( + "fmt" "math/big" "path/filepath" "strings" @@ -41,9 +42,13 @@ func TestFirehosePrestate(t *testing.T) { for _, concurrent := range []bool{true, false} { for _, folder := range testFolders { name := filepath.Base(folder) + concurrencyLabel := "sequential" + if concurrent { + concurrencyLabel = "concurrent" + } for _, model := range tracingModels { - t.Run(string(model)+"/"+name, func(t *testing.T) { + t.Run(fmt.Sprintf("%s/%s/%s", model, name, concurrencyLabel), func(t *testing.T) { tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, concurrent) defer onClose() @@ -52,7 +57,8 @@ func TestFirehosePrestate(t *testing.T) { tracer.CloseBlockPrintQueue() genesisLine, blockLines, unknownLines := readTracerFirehoseLines(t, tracer) - require.Len(t, unknownLines, 0, "Lines:\n%s", strings.Join(slicesMap(unknownLines, func(l unknownLine) string { return "- '" + string(l) + "'" }), "\n")) + require.Len(t, unknownLines, 0, "Lines:\n%s", strings.Join( + slicesMap(unknownLines, func(l unknownLine) string { return "- '" + string(l) + "'" }), "\n")) require.NotNil(t, genesisLine) blockLines.assertOnlyBlockEquals(t, filepath.Join(folder, string(model)), 1) }) @@ -189,8 +195,13 @@ func testBlockTracesCorrectly(t *testing.T, genesisSpec *core.Genesis, engine co t.Helper() for _, concurrent := range []bool{true, false} { + concurrencyLabel := "sequential" + if concurrent { + concurrencyLabel = "concurrent" + } + for _, model := range tracingModels { - t.Run(string(model), func(t *testing.T) { + t.Run(fmt.Sprintf("%s/%s", model, concurrencyLabel), func(t *testing.T) { tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, concurrent) defer onClose()