From 44b94ca6d3e709d0a04275b2e1feb3ae971b9ccd Mon Sep 17 00:00:00 2001 From: marcello33 Date: Thu, 6 Feb 2025 13:05:46 +0100 Subject: [PATCH] POS-2821: solve lint issues --- accounts/abi/unpack_test.go | 2 +- beacon/types/beacon_block.go | 2 +- beacon/types/exec_header.go | 2 +- cmd/evm/t8n_test.go | 4 ++-- cmd/rlpdump/main.go | 2 +- core/rawdb/accessors_chain_test.go | 4 ++-- eth/tracers/logger/logger.go | 2 +- internal/cli/flagset/flagset.go | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 97af3034f2..b43f1b1524 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -1014,7 +1014,7 @@ func TestOOMMaliciousInput(t *testing.T) { encb, err := hex.DecodeString(test.enc) if err != nil { - t.Fatalf("invalid hex: %s" + test.enc) + t.Fatalf("invalid hex: %s", test.enc) } _, err = abi.Methods["method"].Outputs.UnpackValues(encb) diff --git a/beacon/types/beacon_block.go b/beacon/types/beacon_block.go index 370152114a..e4cd1340e5 100644 --- a/beacon/types/beacon_block.go +++ b/beacon/types/beacon_block.go @@ -48,7 +48,7 @@ func BlockFromJSON(forkName string, data []byte) (*BeaconBlock, error) { case "capella": obj = new(capella.BeaconBlock) default: - return nil, fmt.Errorf("unsupported fork: " + forkName) + return nil, fmt.Errorf("unsupported fork: %s", forkName) } if err := json.Unmarshal(data, obj); err != nil { return nil, err diff --git a/beacon/types/exec_header.go b/beacon/types/exec_header.go index dce101ba20..b5f90bae25 100644 --- a/beacon/types/exec_header.go +++ b/beacon/types/exec_header.go @@ -46,7 +46,7 @@ func ExecutionHeaderFromJSON(forkName string, data []byte) (*ExecutionHeader, er case "deneb": obj = new(deneb.ExecutionPayloadHeader) default: - return nil, fmt.Errorf("unsupported fork: " + forkName) + return nil, fmt.Errorf("unsupported fork: %s", forkName) } if err := json.Unmarshal(data, obj); err != nil { return nil, err diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index a982b983ca..55c8d7e1fc 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -547,7 +547,7 @@ func TestT9n(t *testing.T) { switch { case err != nil: - t.Logf(string(have)) + t.Log(string(have)) t.Fatalf("test %d, json parsing failed: %v", i, err) case !ok: t.Fatalf("test %d: output wrong, have \n%v\nwant\n%v\n", i, string(have), string(want)) @@ -696,7 +696,7 @@ func TestB11r(t *testing.T) { switch { case err != nil: - t.Logf(string(have)) + t.Log(string(have)) t.Fatalf("test %d, json parsing failed: %v", i, err) case !ok: t.Fatalf("test %d: output wrong, have \n%v\nwant\n%v\n", i, string(have), string(want)) diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 9c9780c5c9..ba80f3b96a 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -155,7 +155,7 @@ func dump(in *inStream, s *rlp.Stream, depth int, out io.Writer) error { defer s.ListEnd() if size == 0 { - fmt.Fprintf(out, ws(depth)+"[]") + fmt.Fprint(out, ws(depth)+"[]") } else { fmt.Fprintln(out, ws(depth)+"[") diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index fadd73cf49..e41bef4b90 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -422,7 +422,7 @@ func TestBlockReceiptStorage(t *testing.T) { t.Fatalf("no receipts returned") } else { if err := checkReceiptsRLP(rs, receipts); err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } } // Delete the body and ensure that the receipts are no longer returned (metadata can't be recomputed) @@ -432,7 +432,7 @@ func TestBlockReceiptStorage(t *testing.T) { } // Ensure that receipts without metadata can be returned without the block body too if err := checkReceiptsRLP(ReadRawReceipts(db, hash, 0), receipts); err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } // Sanity check that body alone without the receipt is a full purge WriteBody(db, hash, 0, body) diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index e36ea0d545..70c3df9c60 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -478,7 +478,7 @@ func formatLogs(logs []StructLog) []StructLogRes { formatted[index].Stack = &stack } - if trace.ReturnData != nil && len(trace.ReturnData) > 0 { + if len(trace.ReturnData) > 0 { formatted[index].ReturnData = hexutil.Bytes(trace.ReturnData).String() } if trace.Memory != nil { diff --git a/internal/cli/flagset/flagset.go b/internal/cli/flagset/flagset.go index 6443d4f8b7..f313ad0e86 100644 --- a/internal/cli/flagset/flagset.go +++ b/internal/cli/flagset/flagset.go @@ -378,7 +378,7 @@ func (i *SliceStringFlag) UpdateValue(value string) { } func (f *Flagset) SliceStringFlag(s *SliceStringFlag) { - if s.Default == nil || len(s.Default) == 0 { + if len(s.Default) == 0 { f.addFlag(&FlagVar{ Name: s.Name, Usage: s.Usage, @@ -482,7 +482,7 @@ func (m *MapStringFlag) UpdateValue(value string) { } func (f *Flagset) MapStringFlag(m *MapStringFlag) { - if m.Default == nil || len(m.Default) == 0 { + if len(m.Default) == 0 { f.addFlag(&FlagVar{ Name: m.Name, Usage: m.Usage,