Skip to content

Commit 0ead1aa

Browse files
authored
gomods -go fix ./... (#2336)
1 parent fd6000f commit 0ead1aa

16 files changed

Lines changed: 55 additions & 56 deletions

File tree

keystore/corekeys/models/models.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66
"math/big"
7+
"slices"
78
"time"
89

910
gethkeystore "github.com/ethereum/go-ethereum/accounts/keystore"
@@ -140,9 +141,9 @@ func (ks *KeyStates) Enable(addr common.Address, chainID *big.Int, updatedAt tim
140141
// warning: not thread-safe! caller must sync
141142
func (ks *KeyStates) Delete(addr common.Address) {
142143
var chainIDs []*big.Int
143-
for i := len(ks.All) - 1; i >= 0; i-- {
144-
if ks.All[i].Address.Address() == addr {
145-
chainIDs = append(chainIDs, ks.All[i].EVMChainID.ToInt())
144+
for i, v := range slices.Backward(ks.All) {
145+
if v.Address.Address() == addr {
146+
chainIDs = append(chainIDs, v.EVMChainID.ToInt())
146147
ks.All = append(ks.All[:i], ks.All[i+1:]...)
147148
}
148149
}

pkg/beholder/batch_emitter_service.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ func (e *ChipIngressBatchEmitterService) emitInternal(ctx context.Context, body
171171
// every dropped event. chip_ingress.events_dropped (error_code) already
172172
// captures that it's happening and roughly why; the full reason isn't
173173
// needed at fleet-wide log volume.
174-
var pubErr *batch.PublishError
175-
if !errors.As(sendErr, &pubErr) {
174+
if _, ok := errors.AsType[*batch.PublishError](sendErr); !ok {
176175
e.eng.Errorw("failed to emit to chip ingress",
177176
"error", sendErr,
178177
"error_code", errorCode,

pkg/beholder/metered_exporter_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,11 +498,9 @@ func TestExportStatsHandler_ConcurrentRPCsIsolated(t *testing.T) {
498498
for i := 1; i <= n; i++ {
499499
size := i
500500
want += int64(size)
501-
wg.Add(1)
502-
go func() {
503-
defer wg.Done()
501+
wg.Go(func() {
504502
simulateRPC(h, context.Background(), size, nil)
505-
}()
503+
})
506504
}
507505
wg.Wait()
508506

pkg/capabilities/cli/cmd/go_reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (g *GoStructReader) configName(field *ast.Field) string {
116116
tag := reflect.StructTag(field.Tag.Value[1 : len(field.Tag.Value)-1])
117117
jsonTag := tag.Get("json")
118118
if jsonTag != "" {
119-
jsonName := strings.Split(jsonTag, ",")[0]
119+
jsonName, _, _ := strings.Cut(jsonTag, ",")
120120
if jsonName != "" {
121121
return jsonName
122122
}

pkg/capabilities/v2/gen/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func generateFlat(gen *pkg.ProtocGen, proto, outDir string) error {
2727
return err
2828
}
2929

30-
topDir := strings.Split(proto, string(os.PathSeparator))[0]
30+
topDir, _, _ := strings.Cut(proto, string(os.PathSeparator))
3131
return os.RemoveAll(topDir)
3232
}
3333

pkg/chipingress/batch/client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ func ErrorCodeFor(err error) string {
6565
return ""
6666
}
6767

68-
var pubErr *PublishError
69-
if errors.As(err, &pubErr) {
68+
if pubErr, ok := errors.AsType[*PublishError](err); ok {
7069
if pubErr.Code == ErrCodeResultsMismatch {
7170
return "results_mismatch"
7271
}

pkg/codec/multi_modifier.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package codec
22

33
import (
44
"reflect"
5+
"slices"
56
)
67

78
// MultiModifier is a Modifier that applies each element for the slice in-order (reverse order for TransformForOnChain).
@@ -13,9 +14,9 @@ func (c MultiModifier) RetypeToOffChain(onChainType reflect.Type, itemType strin
1314

1415
func (c MultiModifier) TransformToOnChain(offChainValue any, itemType string) (any, error) {
1516
onChainValue := offChainValue
16-
for i := len(c) - 1; i >= 0; i-- {
17+
for _, v := range slices.Backward(c) {
1718
var err error
18-
if onChainValue, err = c[i].TransformToOnChain(onChainValue, itemType); err != nil {
19+
if onChainValue, err = v.TransformToOnChain(onChainValue, itemType); err != nil {
1920
return nil, err
2021
}
2122
}

pkg/config/toml.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import (
1212
func DecodeTOML(r io.Reader, v any) error {
1313
d := toml.NewDecoder(r).DisallowUnknownFields()
1414
if err := d.Decode(v); err != nil {
15-
var strict *toml.StrictMissingError
16-
if errors.As(err, &strict) {
15+
if strict, ok := errors.AsType[*toml.StrictMissingError](err); ok {
1716
return errors.New(strict.String())
1817
}
1918
return err

pkg/loop/internal/core/services/capability/capabilities.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,7 @@ func (t *triggerExecutableServer) RegisterTrigger(request *pb.TriggerRegistratio
226226

227227
// If it's a capability error, serialize it and send it to the client for proper deserialization and handling on the client side.
228228
errorString := err.Error()
229-
var capErr caperrors.Error
230-
if errors.As(err, &capErr) {
229+
if capErr, ok := errors.AsType[caperrors.Error](err); ok {
231230
errorString = capErr.SerializeToString()
232231
}
233232
msg := &pb.TriggerResponseMessage{
@@ -448,8 +447,7 @@ func (c *executableServer) Execute(reqpb *pb.CapabilityRequest, server pb.Execut
448447
var responseMessage *pb.CapabilityResponse
449448
response, err := c.impl.Execute(server.Context(), req)
450449
if err != nil {
451-
var capabilityError caperrors.Error
452-
if errors.As(err, &capabilityError) {
450+
if capabilityError, ok := errors.AsType[caperrors.Error](err); ok {
453451
responseMessage = &pb.CapabilityResponse{Error: capabilityError.SerializeToString()}
454452
} else {
455453
// All other errors are treated as private visibility and are marked as such to prevent accidental or malicious

pkg/loop/internal/relayer/pluginprovider/contractreader/contract_reader_test.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"maps"
99
"math/big"
1010
"reflect"
11+
"slices"
1112
"sort"
1213
"strconv"
1314
"strings"
@@ -533,9 +534,9 @@ func (f *fakeContractReader) GetLatestValue(_ context.Context, readIdentifier st
533534
if strings.HasSuffix(readIdentifier, MethodReturningAlterableUint64) {
534535
r := returnVal.(*uint64)
535536
vals := f.vals[contractName]
536-
for i := len(vals) - 1; i >= 0; i-- {
537-
if vals[i].confidenceLevel == confidenceLevel {
538-
*r = vals[i].val
537+
for _, val := range slices.Backward(vals) {
538+
if val.confidenceLevel == confidenceLevel {
539+
*r = val.val
539540
return nil
540541
}
541542
}
@@ -577,9 +578,9 @@ func (f *fakeContractReader) GetLatestValue(_ context.Context, readIdentifier st
577578
return types.ErrNotFound
578579
}
579580

580-
for i := len(events) - 1; i >= 0; i-- {
581-
if events[i].confidenceLevel == confidenceLevel {
582-
*returnVal.(*TestStruct) = events[i].event.(TestStruct)
581+
for _, event := range slices.Backward(events) {
582+
if event.confidenceLevel == confidenceLevel {
583+
*returnVal.(*TestStruct) = event.event.(TestStruct)
583584
return nil
584585
}
585586
}
@@ -590,8 +591,8 @@ func (f *fakeContractReader) GetLatestValue(_ context.Context, readIdentifier st
590591
defer f.lock.Unlock()
591592
param := params.(*FilterEventParams)
592593
triggers := f.triggers.getEvents(func(e event) bool { return e.contractID == contractName && e.eventType == EventName })
593-
for i := len(triggers) - 1; i >= 0; i-- {
594-
testStruct := triggers[i].event.(TestStruct)
594+
for _, trigger := range slices.Backward(triggers) {
595+
testStruct := trigger.event.(TestStruct)
595596
if *testStruct.Field == param.Field {
596597
*returnVal.(*TestStruct) = testStruct
597598
return nil
@@ -608,9 +609,9 @@ func (f *fakeContractReader) GetLatestValue(_ context.Context, readIdentifier st
608609
return types.ErrNotFound
609610
}
610611

611-
for i := len(triggers) - 1; i >= 0; i-- {
612-
if triggers[i].confidenceLevel == confidenceLevel {
613-
*returnVal.(*SomeDynamicTopicEvent) = triggers[i].event.(SomeDynamicTopicEvent)
612+
for _, trigger := range slices.Backward(triggers) {
613+
if trigger.confidenceLevel == confidenceLevel {
614+
*returnVal.(*SomeDynamicTopicEvent) = trigger.event.(SomeDynamicTopicEvent)
614615
return nil
615616
}
616617
}

0 commit comments

Comments
 (0)