Skip to content

Commit

Permalink
Fixes lints (#3616)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjayrush authored Apr 26, 2024
1 parent c49022b commit 5a00f3e
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 67 deletions.
4 changes: 2 additions & 2 deletions src/apps/chifra/.golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
skip-files:
exlude-files:
- ".*_test.go"
linters:
disable:
Expand All @@ -9,4 +9,4 @@ linters-settings:
checks:
- all
# Disable ST1003 correct capitalization of initialisms
- -ST1003
- -ST1003
4 changes: 1 addition & 3 deletions src/apps/chifra/pkg/base/types_wei_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package base

import (
"fmt"
"testing"
)

Expand Down Expand Up @@ -107,8 +106,7 @@ func TestToEther(t *testing.T) {
if got != test.expected {
t.Errorf("ToEther(%v) want %v, got %v", test.input, test.expected, got)
}
//lint:ignore S1025 sorry
got = fmt.Sprintf("%s", ToEther(test.input))
got = ToEther(test.input).String()
if got != test.expected {
t.Errorf("ToEther(%v) want %v, got %v", test.input, test.expected, got)
}
Expand Down
98 changes: 49 additions & 49 deletions src/apps/chifra/pkg/output/json_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ func TestJsonWriter_EmptyField(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand All @@ -62,10 +62,10 @@ func TestJsonWriter_EmptySubField(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.OpenField("", FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.OpenField("", FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand All @@ -87,11 +87,11 @@ func TestJsonWriter_SingleKey(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.OpenField("", FieldObject)
w.Write([]byte(`"key": true`))
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.OpenField("", FieldObject)
_, _ = w.Write([]byte(`"key": true`))
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand All @@ -113,12 +113,12 @@ func TestJsonWriter_SingleEmptySubkey(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.OpenField("", FieldObject)
w.OpenField("subkey", FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.OpenField("", FieldObject)
_, _ = w.OpenField("subkey", FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand All @@ -142,13 +142,13 @@ func TestJsonWriter_SingleNonEmptySubkey(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.OpenField("", FieldObject)
w.OpenField("subkey", FieldObject)
w.Write([]byte(`"key": true`))
w.CloseField(FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.OpenField("", FieldObject)
_, _ = w.OpenField("subkey", FieldObject)
_, _ = w.Write([]byte(`"key": true`))
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand All @@ -173,14 +173,14 @@ func TestJsonWriter_SingleNonEmptySubkeyMultipleChildren(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.OpenField("data", FieldArray)
w.OpenField("", FieldObject)
w.OpenField("subkey", FieldObject)
w.Write([]byte(`"key1": true`))
w.Write([]byte(`"key2": false`))
w.CloseField(FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.OpenField("data", FieldArray)
_, _ = w.OpenField("", FieldObject)
_, _ = w.OpenField("subkey", FieldObject)
_, _ = w.Write([]byte(`"key1": true`))
_, _ = w.Write([]byte(`"key2": false`))
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)
w.Close()

result := buf.String()
Expand Down Expand Up @@ -239,14 +239,14 @@ func TestJsonWriter_MultipleItemsWithSubitems(t *testing.T) {
if err != nil {
t.Fatal(err)
}
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)

w.OpenField("errors", FieldArray)
w.CloseField(FieldArray)
_, _ = w.OpenField("errors", FieldArray)
_, _ = w.CloseField(FieldArray)

w.OpenField("meta", FieldObject)
w.CloseField(FieldObject)
_, _ = w.OpenField("meta", FieldObject)
_, _ = w.CloseField(FieldObject)

w.Close()

Expand All @@ -263,7 +263,7 @@ func TestJsonWriter_openRoot(t *testing.T) {
b := make([]byte, 0, 1024)
buf := bytes.NewBuffer(b)
w := NewJsonWriter(buf)
w.Write([]byte(""))
_, _ = w.Write([]byte(""))

result := buf.String()

Expand Down Expand Up @@ -311,8 +311,8 @@ func TestJsonWriter_CloseApiResponse(t *testing.T) {
if err != nil {
t.Fatal(err)
}
w.CloseField(FieldObject)
w.CloseField(FieldArray)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldArray)

w.WriteError(errors.New("error1"))
w.WriteError(errors.New("error2"))
Expand Down Expand Up @@ -341,7 +341,7 @@ func TestJsonWriter_WriteCompound(t *testing.T) {
Key: "data",
FieldType: FieldArray,
}
w.WriteCompoundItem("", map[string]bool{"key": true})
_, _ = w.WriteCompoundItem("", map[string]bool{"key": true})
w.Close()

result := buf.String()
Expand Down Expand Up @@ -369,8 +369,8 @@ func TestJsonWriter_WriteCompoundTwice(t *testing.T) {
Key: "data",
FieldType: FieldArray,
}
w.WriteCompoundItem("", map[string]bool{"first": true})
w.WriteCompoundItem("", map[string]bool{"second": true})
_, _ = w.WriteCompoundItem("", map[string]bool{"first": true})
_, _ = w.WriteCompoundItem("", map[string]bool{"second": true})
w.Close()

result := buf.String()
Expand All @@ -395,10 +395,10 @@ func TestJsonWriter_DefaultField(t *testing.T) {
Key: "data",
FieldType: FieldArray,
}
w.OpenField("", FieldObject)
w.OpenField("subkey", FieldObject)
w.CloseField(FieldObject)
w.CloseField(FieldObject)
_, _ = w.OpenField("", FieldObject)
_, _ = w.OpenField("subkey", FieldObject)
_, _ = w.CloseField(FieldObject)
_, _ = w.CloseField(FieldObject)
w.Close()

result := buf.String()
Expand Down Expand Up @@ -441,7 +441,7 @@ func TestJsonWriter_DefaultFieldCompound(t *testing.T) {
Key: "data",
FieldType: FieldArray,
}
w.WriteCompoundItem("", map[string]string{})
_, _ = w.WriteCompoundItem("", map[string]string{})
w.Close()

result := buf.String()
Expand Down
10 changes: 5 additions & 5 deletions src/apps/chifra/pkg/output/stream_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var input = types.Receipt{

func helperStreamFormats(w csv.Writer, outputBuffer *bytes.Buffer, chain, format string, expectKeys bool) error {
buffer := new(bytes.Buffer)
StreamModel(buffer, input.Model(chain, format, false, nil), OutputOptions{
_ = StreamModel(buffer, input.Model(chain, format, false, nil), OutputOptions{
Format: format,
NoHeader: !expectKeys,
})
Expand All @@ -52,9 +52,9 @@ func helperStreamFormats(w csv.Writer, outputBuffer *bytes.Buffer, chain, format
expectedItems = append(expectedItems, fmt.Sprint(data[key]))
}
if expectKeys {
w.Write(input.Model(chain, format, false, nil).Order)
_ = w.Write(input.Model(chain, format, false, nil).Order)
}
w.Write(expectedItems)
_ = w.Write(expectedItems)
w.Flush()
expected := outputBuffer.String()

Expand Down Expand Up @@ -94,7 +94,7 @@ func TestStreamJson(t *testing.T) {
outputBuffer := &bytes.Buffer{}
w := NewJsonWriter(outputBuffer)
w.DefaultField = DefaultField{Key: "Data", FieldType: FieldArray}
StreamModel(w, input.Model(chain, "json", false, nil), OutputOptions{
_ = StreamModel(w, input.Model(chain, "json", false, nil), OutputOptions{
Format: "json",
JsonIndent: " ",
})
Expand Down Expand Up @@ -169,7 +169,7 @@ func TestStreamMany(t *testing.T) {

// Print the values and try to re-parse them to check if
// we get the same data
StreamMany(context.Background(), renderData, OutputOptions{
_ = StreamMany(context.Background(), renderData, OutputOptions{
Writer: jw,
Format: "json",
})
Expand Down
2 changes: 1 addition & 1 deletion src/apps/chifra/pkg/rpc/provider/alchemy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func mockAlchemyServer(t *testing.T) (ts *httptest.Server) {
if err != nil {
t.Fatal(err)
}
w.Write(b)
_, _ = w.Write(b)
}))

return ts
Expand Down
4 changes: 2 additions & 2 deletions src/apps/chifra/pkg/rpc/provider/covalent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func mockCovalentServer(t *testing.T) (ts *httptest.Server) {
if err != nil {
t.Fatal(err)
}
w.Write(b)
_, _ = w.Write(b)
}))

return ts
Expand Down Expand Up @@ -253,7 +253,7 @@ LOOP:
Orig: "14000000",
},
}
results = provider.TransactionsByAddress(ctx, query, errors)
_ = provider.TransactionsByAddress(ctx, query, errors)
err := <-errors
if err == nil {
t.Fatal("expected error")
Expand Down
6 changes: 3 additions & 3 deletions src/apps/chifra/pkg/rpc/provider/etherscan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func mockEtherscanServer(t *testing.T) (ts *httptest.Server) {
if err != nil {
t.Fatal(err)
}
w.Write(b)
_, _ = w.Write(b)
}))

return ts
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestEtherscanProvider_fetchData(t *testing.T) {
t.Fatal(err)
}

data, count, err = provider.fetchData(context.TODO(), base.HexToAddress("0xf503017d7baf7fbc0fff7492b751025c6a78179b"), paginator, "int")
data, _, err = provider.fetchData(context.TODO(), base.HexToAddress("0xf503017d7baf7fbc0fff7492b751025c6a78179b"), paginator, "int")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -227,7 +227,7 @@ LOOP:
Orig: "14000000",
},
}
results = provider.TransactionsByAddress(ctx, query, errors)
_ = provider.TransactionsByAddress(ctx, query, errors)
err := <-errors
if err == nil {
t.Fatal("expected error")
Expand Down
2 changes: 1 addition & 1 deletion src/apps/chifra/pkg/rpc/provider/key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func mockKeyServer(t *testing.T) (ts *httptest.Server) {
if err != nil {
t.Fatal(err)
}
w.Write(b)
_, _ = w.Write(b)
}))

return ts
Expand Down
2 changes: 1 addition & 1 deletion src/apps/chifra/pkg/rpc/provider/paginator_page_id_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestPageIdPaginator_NextPage(t *testing.T) {
if paginator.page != "latest" {
t.Fatal("wrong page after initialization:", paginator.page)
}
paginator.SetNextPage("next")
_ = paginator.SetNextPage("next")

err = paginator.NextPage()
if err != nil {
Expand Down

0 comments on commit 5a00f3e

Please sign in to comment.