From 0d26c9a9b760012d747b7daf2d2cfdc2ca6eb275 Mon Sep 17 00:00:00 2001 From: David Zhou Date: Tue, 13 May 2025 15:57:18 -0400 Subject: [PATCH] PR: Part 3 --- .../internal/tracetest/firehose/firehose_test.go | 13 +++++++++++-- .../internal/tracetest/firehose/helpers_test.go | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eth/tracers/internal/tracetest/firehose/firehose_test.go b/eth/tracers/internal/tracetest/firehose/firehose_test.go index bbc1d1ed5d..1d7d3fd248 100644 --- a/eth/tracers/internal/tracetest/firehose/firehose_test.go +++ b/eth/tracers/internal/tracetest/firehose/firehose_test.go @@ -2,6 +2,7 @@ package firehose_test import ( "fmt" + "github.com/ethereum/go-ethereum/eth/tracers" "math/big" "path/filepath" "strings" @@ -49,7 +50,11 @@ func TestFirehosePrestate(t *testing.T) { for _, model := range tracingModels { t.Run(fmt.Sprintf("%s/%s/%s", model, name, concurrencyLabel), func(t *testing.T) { - tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, concurrent) + config := &tracers.FirehoseConfig{ + ConcurrentBlockFlushing: concurrent, + } + + tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, config) defer onClose() runPrestateBlock(t, filepath.Join(folder, "prestate.json"), tracingHooks) @@ -202,7 +207,11 @@ func testBlockTracesCorrectly(t *testing.T, genesisSpec *core.Genesis, engine co for _, model := range tracingModels { t.Run(fmt.Sprintf("%s/%s", model, concurrencyLabel), func(t *testing.T) { - tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, concurrent) + config := &tracers.FirehoseConfig{ + ConcurrentBlockFlushing: concurrent, + } + + tracer, tracingHooks, onClose := newFirehoseTestTracer(t, model, config) defer onClose() chain, err := core.NewBlockChain(rawdb.NewMemoryDatabase(), nil, genesisSpec, nil, engine, vm.Config{Tracer: tracingHooks}, nil) diff --git a/eth/tracers/internal/tracetest/firehose/helpers_test.go b/eth/tracers/internal/tracetest/firehose/helpers_test.go index 0541d37748..e7f4a4017e 100644 --- a/eth/tracers/internal/tracetest/firehose/helpers_test.go +++ b/eth/tracers/internal/tracetest/firehose/helpers_test.go @@ -29,7 +29,7 @@ type firehoseInitLine struct { type firehoseBlockLines []firehoseBlockLine -func newFirehoseTestTracer(t *testing.T, model tracingModel, concurrentBlockFlushing bool) (*tracers.Firehose, *tracing.Hooks, func()) { +func newFirehoseTestTracer(t *testing.T, model tracingModel, config *tracers.FirehoseConfig) (*tracers.Firehose, *tracing.Hooks, func()) { t.Helper() tracer, err := tracers.NewFirehoseFromRawJSON([]byte(fmt.Sprintf(`{ @@ -39,7 +39,7 @@ func newFirehoseTestTracer(t *testing.T, model tracingModel, concurrentBlockFlus "ignoreGenesisBlock": true, "forcedBackwardCompatibility": %t } - }`, concurrentBlockFlushing, model == tracingModelFirehose2_3))) + }`, config.ConcurrentBlockFlushing, model == tracingModelFirehose2_3))) require.NoError(t, err) hooks := tracers.NewTracingHooksFromFirehose(tracer)