Skip to content

Commit fdf33a4

Browse files
CaraWangstevemilk
authored andcommitted
core: minor fix for the log wrapper with debug purpose (#30454)
After this PR, ethereum/go-ethereum#28187, the way to set the default logger is different. This PR only updates the way to set logger in some test cases' comments that existed in the codebase (since this commit ethereum/go-ethereum@b63e3c37a6). Although I am not sure if it a good way to leave the code in the comment, it truly makes me more efficiently to debug and fix the failing test cases.
1 parent 181ddaf commit fdf33a4

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

core/blockchain_repair_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1757,8 +1757,8 @@ func testRepair(t *testing.T, tt *rewindTest, snapshots bool) {
17571757

17581758
func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme string) {
17591759
// It's hard to follow the test case, visualize the input
1760-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
1761-
// fmt.Println(tt.dump(true))
1760+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
1761+
// fmt.Println(tt.dump(false))
17621762

17631763
// Create a temporary persistent database
17641764
datadir := t.TempDir()
@@ -1908,7 +1908,7 @@ func TestIssue23496(t *testing.T) {
19081908

19091909
func testIssue23496(t *testing.T, scheme string) {
19101910
// It's hard to follow the test case, visualize the input
1911-
//log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
1911+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
19121912

19131913
// Create a temporary persistent database
19141914
datadir := t.TempDir()

core/blockchain_sethead_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ func testSetHead(t *testing.T, tt *rewindTest, snapshots bool) {
19611961

19621962
func testSetHeadWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme string) {
19631963
// It's hard to follow the test case, visualize the input
1964-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
1964+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
19651965
// fmt.Println(tt.dump(false))
19661966

19671967
// Create a temporary persistent database

core/blockchain_snapshot_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ type snapshotTest struct {
222222

223223
func (snaptest *snapshotTest) test(t *testing.T) {
224224
// It's hard to follow the test case, visualize the input
225-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
226-
// fmt.Println(tt.dump())
225+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
226+
// fmt.Println(snaptest.dump())
227227
chain, blocks := snaptest.prepare(t)
228228

229229
// Restart the chain normally
@@ -245,8 +245,8 @@ type crashSnapshotTest struct {
245245

246246
func (snaptest *crashSnapshotTest) test(t *testing.T) {
247247
// It's hard to follow the test case, visualize the input
248-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
249-
// fmt.Println(tt.dump())
248+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
249+
// fmt.Println(snaptest.dump())
250250
chain, blocks := snaptest.prepare(t)
251251

252252
// Pull the plug on the database, simulating a hard crash
@@ -297,8 +297,8 @@ type gappedSnapshotTest struct {
297297

298298
func (snaptest *gappedSnapshotTest) test(t *testing.T) {
299299
// It's hard to follow the test case, visualize the input
300-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
301-
// fmt.Println(tt.dump())
300+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
301+
// fmt.Println(snaptest.dump())
302302
chain, blocks := snaptest.prepare(t)
303303

304304
// Insert blocks without enabling snapshot if gapping is required.
@@ -341,8 +341,8 @@ type setHeadSnapshotTest struct {
341341

342342
func (snaptest *setHeadSnapshotTest) test(t *testing.T) {
343343
// It's hard to follow the test case, visualize the input
344-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
345-
// fmt.Println(tt.dump())
344+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
345+
// fmt.Println(snaptest.dump())
346346
chain, blocks := snaptest.prepare(t)
347347

348348
// Rewind the chain if setHead operation is required.
@@ -370,8 +370,8 @@ type wipeCrashSnapshotTest struct {
370370

371371
func (snaptest *wipeCrashSnapshotTest) test(t *testing.T) {
372372
// It's hard to follow the test case, visualize the input
373-
// log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
374-
// fmt.Println(tt.dump())
373+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
374+
// fmt.Println(snaptest.dump())
375375
chain, blocks := snaptest.prepare(t)
376376

377377
// Firstly, stop the chain properly, with all snapshot journal

core/blockchain_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,9 +2126,9 @@ func testSideImport(t *testing.T, numCanonBlocksInSidechain, blocksBetweenCommon
21262126
// [ Cn, Cn+1, Cc, Sn+3 ... Sm]
21272127
// ^ ^ ^ pruned
21282128
func TestPrunedImportSide(t *testing.T) {
2129-
//glogger := log.NewGlogHandler(log.StreamHandler(os.Stdout, log.TerminalFormat(false)))
2130-
//glogger.Verbosity(3)
2131-
//log.Root().SetHandler(log.Handler(glogger))
2129+
// glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, false))
2130+
// glogger.Verbosity(3)
2131+
// log.SetDefault(log.NewLogger(glogger))
21322132
testSideImport(t, 3, 3, -1)
21332133
testSideImport(t, 3, -3, -1)
21342134
testSideImport(t, 10, 0, -1)
@@ -2137,9 +2137,9 @@ func TestPrunedImportSide(t *testing.T) {
21372137
}
21382138

21392139
func TestPrunedImportSideWithMerging(t *testing.T) {
2140-
//glogger := log.NewGlogHandler(log.StreamHandler(os.Stdout, log.TerminalFormat(false)))
2141-
//glogger.Verbosity(3)
2142-
//log.Root().SetHandler(log.Handler(glogger))
2140+
// glogger := log.NewGlogHandler(log.NewTerminalHandler(os.Stderr, false))
2141+
// glogger.Verbosity(3)
2142+
// log.SetDefault(log.NewLogger(glogger))
21432143
testSideImport(t, 3, 3, 0)
21442144
testSideImport(t, 3, -3, 0)
21452145
testSideImport(t, 10, 0, 0)
@@ -3629,7 +3629,7 @@ func TestSetCanonical(t *testing.T) {
36293629
}
36303630

36313631
func testSetCanonical(t *testing.T, scheme string) {
3632-
//log.Root().SetHandler(log.LvlFilterHandler(log.LvlDebug, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
3632+
// log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true)))
36333633

36343634
var (
36353635
key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

0 commit comments

Comments
 (0)