From 08f6a8b18cd9b0e0774e124814cbfcaf06b6cb7d Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 11:21:03 -0600
Subject: [PATCH] Revert "cmd/evm: make evm blocktest output logs if so
 instructed (#27396)"

This reverts commit df5a1040452706981b80fd6dbe4b8d22952e59cb.
---
 cmd/evm/blockrunner.go   | 15 ++-------------
 tests/block_test.go      |  4 ++--
 tests/block_test_util.go |  6 ++----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go
index ffd3165f55694..ffd76b8fb0c91 100644
--- a/cmd/evm/blockrunner.go
+++ b/cmd/evm/blockrunner.go
@@ -22,8 +22,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/tests"
 	"github.com/urfave/cli/v2"
@@ -44,16 +42,7 @@ func blockTestCmd(ctx *cli.Context) error {
 	glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
 	glogger.Verbosity(log.Lvl(ctx.Int(VerbosityFlag.Name)))
 	log.Root().SetHandler(glogger)
-	var tracer vm.EVMLogger
-	// Configure the EVM logger
-	if ctx.Bool(MachineFlag.Name) {
-		tracer = logger.NewJSONLogger(&logger.Config{
-			EnableMemory:     !ctx.Bool(DisableMemoryFlag.Name),
-			DisableStack:     ctx.Bool(DisableStackFlag.Name),
-			DisableStorage:   ctx.Bool(DisableStorageFlag.Name),
-			EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
-		}, os.Stderr)
-	}
+
 	// Load the test content from the input file
 	src, err := os.ReadFile(ctx.Args().First())
 	if err != nil {
@@ -64,7 +53,7 @@ func blockTestCmd(ctx *cli.Context) error {
 		return err
 	}
 	for i, test := range tests {
-		if err := test.Run(false, tracer); err != nil {
+		if err := test.Run(false); err != nil {
 			return fmt.Errorf("test %v: %w", i, err)
 		}
 	}
diff --git a/tests/block_test.go b/tests/block_test.go
index 2405da1cc7335..9e72f7f9710af 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -48,10 +48,10 @@ func TestBlockchain(t *testing.T) {
 	bt.skipLoad(`.*randomStatetest94.json.*`)
 
 	bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) {
-		if err := bt.checkFailure(t, test.Run(false, nil)); err != nil {
+		if err := bt.checkFailure(t, test.Run(false)); err != nil {
 			t.Errorf("test without snapshotter failed: %v", err)
 		}
-		if err := bt.checkFailure(t, test.Run(true, nil)); err != nil {
+		if err := bt.checkFailure(t, test.Run(true)); err != nil {
 			t.Errorf("test with snapshotter failed: %v", err)
 		}
 	})
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index d3e525a387e3b..45b7e49ae72ac 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -100,7 +100,7 @@ type btHeaderMarshaling struct {
 	BaseFeePerGas *math.HexOrDecimal256
 }
 
-func (t *BlockTest) Run(snapshotter bool, tracer vm.EVMLogger) error {
+func (t *BlockTest) Run(snapshotter bool) error {
 	config, ok := Forks[t.json.Network]
 	if !ok {
 		return UnsupportedForkError{t.json.Network}
@@ -124,9 +124,7 @@ func (t *BlockTest) Run(snapshotter bool, tracer vm.EVMLogger) error {
 		cache.SnapshotLimit = 1
 		cache.SnapshotWait = true
 	}
-	chain, err := core.NewBlockChain(db, cache, gspec, nil, engine, vm.Config{
-		Tracer: tracer,
-	}, nil, nil)
+	chain, err := core.NewBlockChain(db, cache, gspec, nil, engine, vm.Config{}, nil, nil)
 	if err != nil {
 		return err
 	}