forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/evm: address PR feedback on blocktest stdin support

Browse source 
This commit addresses all feedback from @rjl493456442:

1. Result printing location: Removed duplicate report() call from
   inside test loop. Now uses dedicated traceEndMarker on stderr
   instead of printing full results mid-execution.

2. Fork assignment: Fork now always assigned regardless of tracer
   or pass/fail status. Root only assigned when test succeeds,
   following correct semantics.

3. Log suppression: Removed automatic log suppression. Users can
   control logging via standard --verbosity and --log.file flags.
   Only one rare INFO log exists in blocktest path.

The traceEndMarker provides clear delimiter for trace parsers
(e.g., goevmlab) without duplicating test results. Format:
{"testEnd":{"name":"...","pass":true,"fork":"...","root":"..."}}

This follows precedent from Nethermind PR #9432.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Bhargava Shastry 2025-10-15 11:28:03 +02:00
parent 838ef5c041
commit 850013414b
1 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
cmd/evm/blockrunner.go
View file

@ -28,7 +28,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/tests"
"github.com/urfave/cli/v2"
)
@ -81,6 +80,41 @@ func blockTestCmd(ctx *cli.Context) error {
return nil
}
// traceEndMarker represents the final status of a blocktest when tracing is enabled.
// It is written as the last line of trace output in JSONL format to signal completion.
type traceEndMarker struct {
TestEnd traceEndDetails `json:"testEnd"`
}
type traceEndDetails struct {
Name string `json:"name"`
Pass bool `json:"pass"`
Fork string `json:"fork"`
Root string `json:"root,omitempty"`
Error string `json:"error,omitempty"`
}
// writeTraceEndMarker writes a blocktest end marker to stderr in JSONL format.
// This provides a clear delimiter for trace parsers (e.g., goevmlab) to know when
// the trace output for a specific test is complete, enabling proper batched processing.
func writeTraceEndMarker(name string, pass bool, fork string, root *common.Hash, errMsg string) {
details := traceEndDetails{
Name: name,
Pass: pass,
Fork: fork,
}
if root != nil {
details.Root = root.Hex()
}
if !pass && errMsg != "" {
details.Error = errMsg
}
marker := traceEndMarker{TestEnd: details}
if data, err := json.Marshal(marker); err == nil {
fmt.Fprintf(os.Stderr, "%s\n", data)
}
}
func runBlockTest(ctx *cli.Context, fname string) ([]testResult, error) {
src, err := os.ReadFile(fname)
if err != nil {
@ -96,11 +130,6 @@ func runBlockTest(ctx *cli.Context, fname string) ([]testResult, error) {
}
tracer := tracerFromFlags(ctx)
// Suppress INFO logs when tracing to avoid polluting stderr
if tracer != nil {
log.SetDefault(log.NewLogger(log.DiscardHandler()))
}
// Pull out keys to sort and ensure tests are run in order.
keys := slices.Sorted(maps.Keys(tests))
@ -128,12 +157,18 @@ func runBlockTest(ctx *cli.Context, fname string) ([]testResult, error) {
result.Pass, result.Error = false, err.Error()
}
// Write result between transactions when tracing is enabled
if tracer != nil {
// Always assign fork (regardless of pass/fail or tracer)
result.Fork = test.Network()
// Assign root if test succeeded
if result.Pass && finalRoot != nil {
result.Root = finalRoot
report(ctx, []testResult{*result})
}
// When tracing, write end marker to delimit trace output for this test
if tracer != nil {
writeTraceEndMarker(result.Name, result.Pass, result.Fork, finalRoot, result.Error)
}
results = append(results, *result)
}
return results, nil