renaming GetLogger

# Conflicts:
#	cmd/evm/internal/t8ntool/transition.go
#	eth/tracers/logger/logger_test.go
#	eth/tracers/tracers_test.go

cmd/evm/blockrunner.go

@@ -58,7 +58,7 @@ func blockTestCmd(ctx *cli.Context) error {
 			DisableStack:     ctx.Bool(DisableStackFlag.Name),
 			DisableStorage:   ctx.Bool(DisableStorageFlag.Name),
 			EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
-		}, os.Stderr).GetLogger()
+		}, os.Stderr).Logger()
 	}
 	// Load the test content from the input file
 	src, err := os.ReadFile(ctx.Args().First())

cmd/evm/internal/t8ntool/transition.go

@@ -124,8 +124,7 @@ func Transition(ctx *cli.Context) error {
 			if err != nil {
 				return nil, nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
 			}
-			prevFile = traceFile
+			logger := logger.NewJSONLogger(logConfig, traceFile).Logger()
-			logger := logger.NewJSONLogger(logConfig, traceFile).GetLogger()
 			tracer := &directory.Tracer{
 				LiveLogger: logger,
 				// JSONLogger streams out result to file.

cmd/evm/runner.go

@@ -128,10 +128,10 @@ func runCmd(ctx *cli.Context) error {
 		blobBaseFee = new(big.Int) // TODO (MariusVanDerWijden) implement blob fee in state tests
 	)
 	if ctx.Bool(MachineFlag.Name) {
-		tracer = logger.NewJSONLogger(logconfig, os.Stdout).GetLogger()
+		tracer = logger.NewJSONLogger(logconfig, os.Stdout).Logger()
 	} else if ctx.Bool(DebugFlag.Name) {
 		debugLogger = logger.NewStructLogger(logconfig)
-		tracer = debugLogger.GetTracer().LiveLogger
+		tracer = debugLogger.Logger()
 	} else {
 		debugLogger = logger.NewStructLogger(logconfig)
 	}

cmd/evm/staterunner.go

@@ -61,10 +61,10 @@ func stateTestCmd(ctx *cli.Context) error {
 	var cfg vm.Config
 	switch {
 	case ctx.Bool(MachineFlag.Name):
-		cfg.Tracer = logger.NewJSONLogger(config, os.Stderr).GetLogger()
+		cfg.Tracer = logger.NewJSONLogger(config, os.Stderr).Logger()
 
 	case ctx.Bool(DebugFlag.Name):
-		cfg.Tracer = logger.NewStructLogger(config).GetTracer().LiveLogger
+		cfg.Tracer = logger.NewStructLogger(config).Logger()
 	}
 	// Load the test content from the input file
 	if len(ctx.Args().First()) != 0 {

core/blockchain_test.go

@@ -3248,7 +3248,7 @@ func testDeleteRecreateSlots(t *testing.T, scheme string) {
 	})
 	// Import the canonical chain
 	chain, err := NewBlockChain(rawdb.NewMemoryDatabase(), DefaultCacheConfigWithScheme(scheme), gspec, nil, engine, vm.Config{
-		Tracer: logger.NewJSONLogger(nil, os.Stdout).GetLogger(),
+		Tracer: logger.NewJSONLogger(nil, os.Stdout).Logger(),
 	}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create tester chain: %v", err)
@@ -3330,7 +3330,7 @@ func testDeleteRecreateAccount(t *testing.T, scheme string) {
 	})
 	// Import the canonical chain
 	chain, err := NewBlockChain(rawdb.NewMemoryDatabase(), DefaultCacheConfigWithScheme(scheme), gspec, nil, engine, vm.Config{
-		Tracer: logger.NewJSONLogger(nil, os.Stdout).GetLogger(),
+		Tracer: logger.NewJSONLogger(nil, os.Stdout).Logger(),
 	}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create tester chain: %v", err)

eth/tracers/api.go

@@ -777,7 +777,7 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
 			// Swap out the noop logger to the standard tracer
 			writer = bufio.NewWriter(dump)
 			vmConf = vm.Config{
-				Tracer:                  logger.NewJSONLogger(&logConfig, writer).GetLogger(),
+				Tracer:                  logger.NewJSONLogger(&logConfig, writer).Logger(),
 				EnablePreimageRecording: true,
 			}
 		}
@@ -930,7 +930,7 @@ func (api *API) traceTx(ctx context.Context, message *core.Message, txctx *direc
 		config = &TraceConfig{}
 	}
 	// Default tracer is the struct logger
-	tracer = logger.NewStructLogger(config.Config).GetTracer()
+	tracer = logger.NewStructLogger(config.Config).Tracer()
 	if config.Tracer != nil {
 		tracer, err = directory.DefaultDirectory.New(*config.Tracer, txctx, config.TracerConfig)
 		if err != nil {

eth/tracers/logger/logger.go

@@ -133,16 +133,20 @@ func NewStructLogger(cfg *Config) *StructLogger {
 	return logger
 }
 
-func (l *StructLogger) GetTracer() *directory.Tracer {
+func (l *StructLogger) Logger() *live.LiveLogger {
+	return &live.LiveLogger{
+		CaptureTxStart: l.CaptureTxStart,
+		CaptureTxEnd:   l.CaptureTxEnd,
+		CaptureEnd:     l.CaptureEnd,
+		CaptureState:   l.CaptureState,
+	}
+}
+
+func (l *StructLogger) Tracer() *directory.Tracer {
 	return &directory.Tracer{
-		LiveLogger: &live.LiveLogger{
+		LiveLogger: l.Logger(),
-			CaptureTxStart: l.CaptureTxStart,
+		GetResult:  l.GetResult,
-			CaptureTxEnd:   l.CaptureTxEnd,
+		Stop:       l.Stop,
-			CaptureEnd:     l.CaptureEnd,
-			CaptureState:   l.CaptureState,
-		},
-		GetResult: l.GetResult,
-		Stop:      l.Stop,
 	}
 }
 

eth/tracers/logger/logger_json.go

@@ -45,7 +45,7 @@ func NewJSONLogger(cfg *Config, writer io.Writer) *JSONLogger {
 	return l
 }
 
-func (l *JSONLogger) GetLogger() *live.LiveLogger {
+func (l *JSONLogger) Logger() *live.LiveLogger {
 	return &live.LiveLogger{
 		CaptureTxStart: l.CaptureTxStart,
 		CaptureEnd:     l.CaptureEnd,

eth/tracers/logger/logger_test.go

@@ -55,7 +55,7 @@ func (*dummyStatedb) SetState(_ common.Address, _ common.Hash, _ common.Hash) {}
 func TestStoreCapture(t *testing.T) {
 	var (
 		logger   = NewStructLogger(nil)
-		env      = vm.NewEVM(vm.BlockContext{}, vm.TxContext{}, &dummyStatedb{}, params.TestChainConfig, vm.Config{Tracer: logger.GetTracer().LiveLogger})
+		env      = vm.NewEVM(vm.BlockContext{}, vm.TxContext{}, &dummyStatedb{}, params.TestChainConfig, vm.Config{Tracer: logger.Logger()})
 		contract = vm.NewContract(&dummyContractRef{}, &dummyContractRef{}, new(big.Int), 100000)
 	)
 	contract.Code = []byte{byte(vm.PUSH1), 0x1, byte(vm.PUSH1), 0x0, byte(vm.SSTORE)}

eth/tracers/tracers_test.go

@@ -89,7 +89,7 @@ func BenchmarkTransactionTrace(b *testing.B) {
 		//EnableMemory: false,
 		//EnableReturnData: false,
 	})
-	evm := vm.NewEVM(context, txContext, statedb, params.AllEthashProtocolChanges, vm.Config{Tracer: tracer.GetTracer().LiveLogger})
+	evm := vm.NewEVM(context, txContext, statedb, params.AllEthashProtocolChanges, vm.Config{Tracer: tracer.Logger()})
 	msg, err := core.TransactionToMessage(tx, signer, context.BaseFee)
 	if err != nil {
 		b.Fatalf("failed to prepare transaction for tracing: %v", err)

tests/state_test.go

@@ -152,7 +152,7 @@ func withTrace(t *testing.T, gasLimit uint64, test func(vm.Config) error) {
 	}
 	buf := new(bytes.Buffer)
 	w := bufio.NewWriter(buf)
-	config.Tracer = logger.NewJSONLogger(&logger.Config{}, w).GetLogger()
+	config.Tracer = logger.NewJSONLogger(&logger.Config{}, w).Logger()
 	err2 := test(config)
 	if !reflect.DeepEqual(err, err2) {
 		t.Errorf("different error for second run: %v", err2)