Skip to content

Commit 5f187da

Browse files
fix linting issues
1 parent 30b67db commit 5f187da

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run:
33
linters:
44
enable:
55
- exhaustive
6-
- exportloopref
6+
- copyloopvar
77
- revive
88
- goimports
99
- gosec

pkg/solana/config_tracker.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ func (c *ConfigTracker) LatestConfigDetails(ctx context.Context) (changedInBlock
2626
func ConfigFromState(ctx context.Context, state State) (types.ContractConfig, error) {
2727
pubKeys := []types.OnchainPublicKey{}
2828
accounts := []types.Account{}
29+
2930
oracles, err := state.Oracles.Data()
3031
if err != nil {
3132
return types.ContractConfig{}, err
3233
}
33-
for _, o := range oracles {
34-
o := o // https://github.com/golang/go/wiki/CommonMistakes#using-reference-to-loop-iterator-variable
35-
pubKeys = append(pubKeys, o.Signer.Key[:])
36-
accounts = append(accounts, types.Account(o.Transmitter.String()))
34+
35+
for idx := range oracles {
36+
pubKeys = append(pubKeys, oracles[idx].Signer.Key[:])
37+
accounts = append(accounts, types.Account(oracles[idx].Transmitter.String()))
3738
}
3839

3940
onchainConfigStruct := median.OnchainConfig{

pkg/solana/logpoller/parser.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,9 @@ func (v *pgDSLParser) Timestamp(prim primitives.Timestamp) {
9090
return
9191
}
9292

93-
var tm int64
93+
tm := int64(prim.Timestamp) //nolint:gosec // disable G115
9494
if prim.Timestamp > math.MaxInt64 {
9595
tm = 0
96-
} else {
97-
tm = int64(prim.Timestamp)
9896
}
9997

10098
v.expression = fmt.Sprintf(

pkg/solana/report_test.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,11 @@ func TestMedianFromReport(t *testing.T) {
142142
tt = append(tt, test)
143143
}
144144

145-
for _, tc := range tt {
146-
tc := tc
147-
t.Run(tc.name, func(t *testing.T) {
145+
for idx := range tt {
146+
t.Run(tt[idx].name, func(t *testing.T) {
148147
ctx := tests.Context(t)
149148
var pos []median.ParsedAttributedObservation
150-
for i, obs := range tc.obs {
149+
for i, obs := range tt[idx].obs {
151150
pos = append(pos, median.ParsedAttributedObservation{
152151
Value: obs,
153152
JuelsPerFeeCoin: obs,
@@ -156,15 +155,15 @@ func TestMedianFromReport(t *testing.T) {
156155
}
157156
report, err := cdc.BuildReport(ctx, pos)
158157
require.NoError(t, err)
159-
max, err := cdc.MaxReportLength(ctx, len(tc.obs))
158+
max, err := cdc.MaxReportLength(ctx, len(tt[idx].obs))
160159
require.NoError(t, err)
161160
assert.Equal(t, len(report), max)
162161
med, err := cdc.MedianFromReport(ctx, report)
163162
require.NoError(t, err)
164-
assert.Equal(t, tc.expectedMedian.String(), med.String())
163+
assert.Equal(t, tt[idx].expectedMedian.String(), med.String())
165164
count, err := cdc.ObserversCountFromReport(report)
166165
require.NoError(t, err)
167-
assert.Equal(t, len(tc.obs), int(count))
166+
assert.Equal(t, len(tt[idx].obs), int(count))
168167
})
169168
}
170169
}

pkg/solana/txm/pendingtx_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -1303,17 +1303,16 @@ func TestPendingTxContext_ListAllExpiredBroadcastedTxs(t *testing.T) {
13031303
},
13041304
}
13051305

1306-
for _, tt := range tests {
1307-
tt := tt // capture range variable
1308-
t.Run(tt.name, func(t *testing.T) {
1306+
for idx := range tests {
1307+
t.Run(tests[idx].name, func(t *testing.T) {
13091308
// Initialize a new PendingTxContext
13101309
ctx := newPendingTxContext()
13111310

13121311
// Setup the test case
1313-
tt.setup(t, ctx)
1312+
tests[idx].setup(t, ctx)
13141313

13151314
// Execute the function under test
1316-
result := ctx.ListAllExpiredBroadcastedTxs(tt.currBlockHeight)
1315+
result := ctx.ListAllExpiredBroadcastedTxs(tests[idx].currBlockHeight)
13171316

13181317
// Extract the IDs from the result
13191318
var resultIDs []string
@@ -1322,7 +1321,7 @@ func TestPendingTxContext_ListAllExpiredBroadcastedTxs(t *testing.T) {
13221321
}
13231322

13241323
// Assert that the expected IDs match the result IDs (order does not matter)
1325-
assert.ElementsMatch(t, tt.expectedTxIDs, resultIDs)
1324+
assert.ElementsMatch(t, tests[idx].expectedTxIDs, resultIDs)
13261325
})
13271326
}
13281327
}

0 commit comments

Comments
 (0)