diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go index c40a4b8a0164..90ab2f2530d4 100644 --- a/cmd/devp2p/runtest.go +++ b/cmd/devp2p/runtest.go @@ -17,6 +17,7 @@ package main import ( + "log/slog" "os" "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" @@ -86,7 +87,7 @@ func runTests(ctx *cli.Context, tests []utesting.Test) error { } // Disable logging unless explicitly enabled. if !ctx.IsSet("verbosity") && !ctx.IsSet("vmodule") { - log.SetDefault(log.NewLogger(log.DiscardHandler())) + log.SetDefault(log.NewLogger(slog.DiscardHandler)) } // Run the tests. var run = utesting.RunTests diff --git a/cmd/workload/testsuite.go b/cmd/workload/testsuite.go index 25dc17a49e7f..3a1796107d3f 100644 --- a/cmd/workload/testsuite.go +++ b/cmd/workload/testsuite.go @@ -20,6 +20,7 @@ import ( "embed" "errors" "io/fs" + "log/slog" "os" "github.com/ethereum/go-ethereum/core/history" @@ -240,7 +241,7 @@ func runTestCmd(ctx *cli.Context) error { // Disable logging unless explicitly enabled. if !ctx.IsSet("verbosity") && !ctx.IsSet("vmodule") { - log.SetDefault(log.NewLogger(log.DiscardHandler())) + log.SetDefault(log.NewLogger(slog.DiscardHandler)) } // Run the tests. diff --git a/log/handler.go b/log/handler.go index 56eff6671f1b..898d3968b06a 100644 --- a/log/handler.go +++ b/log/handler.go @@ -13,29 +13,6 @@ import ( "github.com/holiman/uint256" ) -type discardHandler struct{} - -// DiscardHandler returns a no-op handler -func DiscardHandler() slog.Handler { - return &discardHandler{} -} - -func (h *discardHandler) Handle(_ context.Context, r slog.Record) error { - return nil -} - -func (h *discardHandler) Enabled(_ context.Context, level slog.Level) bool { - return false -} - -func (h *discardHandler) WithGroup(name string) slog.Handler { - panic("not implemented") -} - -func (h *discardHandler) WithAttrs(attrs []slog.Attr) slog.Handler { - return &discardHandler{} -} - type TerminalHandler struct { mu sync.Mutex wr io.Writer diff --git a/log/root.go b/log/root.go index c09a36b1143c..03007a07e198 100644 --- a/log/root.go +++ b/log/root.go @@ -12,7 +12,7 @@ var ( ) func init() { - root = &logger{slog.New(DiscardHandler())} + root = &logger{slog.New(slog.DiscardHandler)} } // SetDefault sets the default global logger