forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-02 10:03:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

renaming GetLogger

Browse source
This commit is contained in:
Sina Mahmoodi 2024-02-28 19:27:39 +01:00
parent 8cc747f439
commit d65bad2f62
11 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/evm/blockrunner.go
View file

@ -59,7 +59,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())

2
cmd/evm/internal/t8ntool/transition.go
View file

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

4
cmd/evm/runner.go
View file

@ -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)
}

4
cmd/evm/staterunner.go
View file

@ -60,10 +60,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 {

4
core/blockchain_test.go
View file

@ -3064,7 +3064,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)
@ -3146,7 +3146,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)

4
eth/tracers/api.go
View file

@ -778,7 +778,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,
}
}
@ -950,7 +950,7 @@ func (api *API) traceTx(ctx context.Context, tx *types.Transaction, message *cor
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 {

22
eth/tracers/logger/logger.go
View file

@ -134,16 +134,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{
CaptureTxStart: l.CaptureTxStart,
CaptureTxEnd: l.CaptureTxEnd,
CaptureEnd: l.CaptureEnd,
CaptureState: l.CaptureState,
},
GetResult: l.GetResult,
Stop: l.Stop,
LiveLogger: l.Logger(),
GetResult: l.GetResult,
Stop: l.Stop,
}
}

2
eth/tracers/logger/logger_json.go
View file

@ -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,

2
eth/tracers/logger/logger_test.go
View file

@ -56,7 +56,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(uint256.Int), 100000)
)
contract.Code = []byte{byte(vm.PUSH1), 0x1, byte(vm.PUSH1), 0x0, byte(vm.SSTORE)}

2
eth/tracers/tracers_test.go
View file

@ -89,7 +89,7 @@ func BenchmarkTransactionTrace(b *testing.B) {
//EnableMemory: false,
//EnableReturnData: false,
})
evm := vm.NewEVM(context, txContext, state.StateDB, params.AllEthashProtocolChanges, vm.Config{Tracer: tracer.GetTracer().LiveLogger})
evm := vm.NewEVM(context, txContext, state.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)

2
tests/state_test.go
View file

@ -177,7 +177,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)