Skip to content

Commit 5638f16

Browse files
authored
lint fixes (#21569)
1 parent 03c96db commit 5638f16

35 files changed

Lines changed: 74 additions & 125 deletions

File tree

.golangci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
version: "2"
22
run:
33
allow-parallel-runners: true
4+
build-tags:
5+
- integration
6+
- dev
7+
- trace
48
linters:
59
enable:
610
- containedctx

core/capabilities/ccip/ccipevm/pluginconfig.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ocrimpls"
1212
)
1313

14-
const defaultCommitGasLimit = 500_000
15-
1614
// InitializePluginConfig returns a PluginConfig for EVM chains.
1715
func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipocr3.ExtraDataCodecBundle) ccipcommon.PluginConfig {
1816
return ccipcommon.PluginConfig{

core/capabilities/remote/executable/hasher.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ func (r *writeReportExcludeSignaturesHasher) Hash(msg *types.MessageBody) ([32]b
132132
}
133133
default:
134134
return [32]byte{}, fmt.Errorf("unexpected report family: %s", family)
135-
136135
}
137136

138137
req.Payload = payload

core/cmd/solana_transaction_commands_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestShell_SolanaSendSol(t *testing.T) {
6464
{amount: "0", expErr: "amount must be greater than zero"},
6565
{amount: "asdf", expErr: "invalid amount:"},
6666
} {
67-
tt := tt
67+
6868
t.Run(tt.amount, func(t *testing.T) {
6969
startBal, err := balance(from.PublicKey(), url)
7070
require.NoError(t, err)
@@ -86,7 +86,7 @@ func TestShell_SolanaSendSol(t *testing.T) {
8686
}
8787

8888
// Check CLI output
89-
require.Greater(t, len(r.Renders), 0)
89+
require.NotEmpty(t, r.Renders)
9090
renderer := r.Renders[len(r.Renders)-1]
9191
renderedMsg := renderer.(*cmd.SolanaMsgPresenter)
9292
t.Logf("%+v\n", renderedMsg)

core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based/types/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package types
1+
package types //nolint:revive // meaningless name already referenced
22

33
import (
44
"github.com/ethereum/go-ethereum/common"

core/services/chainlink/config_general_dev_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77

88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
10-
11-
"github.com/smartcontractkit/chainlink/v2/core/logger"
1210
)
1311

1412
// Tests in this file only run in dev mode
@@ -18,7 +16,7 @@ func TestTOMLGeneralConfig_DevModeInsecureConfig(t *testing.T) {
1816
t.Parallel()
1917

2018
t.Run("all insecure configs are false by default", func(t *testing.T) {
21-
config, err := GeneralConfigOpts{}.New(logger.TestLogger(t))
19+
config, err := GeneralConfigOpts{}.New()
2220
require.NoError(t, err)
2321

2422
assert.False(t, config.Insecure().DevWebServer())
@@ -34,24 +32,26 @@ func TestTOMLGeneralConfig_DevModeInsecureConfig(t *testing.T) {
3432
*c.Insecure.DisableRateLimiting = true
3533
*c.Insecure.InfiniteDepthQueries = true
3634
*c.Insecure.OCRDevelopmentMode = true
37-
}}.New(logger.TestLogger(t))
35+
}}.New()
3836
require.NoError(t, err)
3937

4038
assert.True(t, config.Insecure().DevWebServer())
4139
assert.True(t, config.Insecure().DisableRateLimiting())
4240
assert.True(t, config.Insecure().InfiniteDepthQueries())
43-
assert.True(t, config.OCRDevelopmentMode())
41+
assert.True(t, config.Insecure().OCRDevelopmentMode())
4442
})
4543

4644
t.Run("ParseConfig accepts insecure values on dev builds", func(t *testing.T) {
47-
opts := GeneralConfigOpts{}
48-
err := opts.ParseConfig(`
49-
[insecure]
50-
DevWebServer = true
51-
`)
52-
cfg, err := opts.init()
45+
opts := GeneralConfigOpts{
46+
ConfigStrings: []string{`
47+
[insecure]
48+
DevWebServer = true
49+
`,
50+
},
51+
}
52+
cfg, err := opts.New()
5353
require.NoError(t, err)
54-
err = cfg.c.Validate()
54+
err = cfg.Validate()
5555
require.NoError(t, err)
5656
})
5757
}

core/services/gateway/handlers/capabilities/handler_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ import (
3131
"github.com/smartcontractkit/chainlink/v2/core/services/gateway/network/mocks"
3232
)
3333

34-
const (
35-
defaultSendChannelBufferSize = 1000
36-
privateKey1 = "65456ffb8af4a2b93959256a8e04f6f2fe0943579fb3c9c3350593aabb89023f"
37-
privateKey2 = "65456ffb8af4a2b93959256a8e04f6f2fe0943579fb3c9c3350593aabb89023e"
38-
triggerID1 = "5"
39-
triggerID2 = "6"
40-
workflowID1 = "15c631d295ef5e32deb99a10ee6804bc4af13855687559d7ff6552ac6dbb2ce0"
41-
workflowExecutionID1 = "95ef5e32deb99a10ee6804bc4af13855687559d7ff6552ac6dbb2ce0abbadeed"
42-
owner1 = "0x00000000000000000000000000000000000000aa"
43-
address1 = "0x853d51d5d9935964267a5050aC53aa63ECA39bc5"
44-
)
45-
4634
func setupHandler(t *testing.T) (*handler, *mocks.HTTPClient, *handlermocks.DON, []gwcommon.TestNode) {
4735
lggr := logger.Test(t)
4836
httpClient := mocks.NewHTTPClient(t)

core/services/gateway/handlers/vault/handler.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -646,27 +646,6 @@ func (h *handler) handleSecretsDelete(ctx context.Context, ar *activeRequest) er
646646
return h.fanOutToVaultNodes(ctx, l, ar)
647647
}
648648

649-
func (h *handler) handleSecretsGet(ctx context.Context, ar *activeRequest) error {
650-
l := logger.With(h.lggr, "method", ar.req.Method, "requestID", ar.req.ID)
651-
652-
secretsGetRequest := &vaultcommon.GetSecretsRequest{}
653-
if err := json.Unmarshal(*ar.req.Params, &secretsGetRequest); err != nil {
654-
return h.sendResponse(ctx, ar, h.errorResponse(ar.req, api.UserMessageParseError, err, nil))
655-
}
656-
for _, getRequest := range secretsGetRequest.Requests {
657-
if getRequest.Id != nil && getRequest.Id.Namespace == "" {
658-
getRequest.Id.Namespace = vaulttypes.DefaultNamespace
659-
}
660-
}
661-
err := h.ValidateGetSecretsRequest(secretsGetRequest)
662-
if err != nil {
663-
l.Warnw("failed to validate get secrets request", "error", err)
664-
return h.sendResponse(ctx, ar, h.errorResponse(ar.req, api.InvalidParamsError, fmt.Errorf("failed to validate get secrets request: %w", err), nil))
665-
}
666-
667-
return h.fanOutToVaultNodes(ctx, l, ar)
668-
}
669-
670649
func (h *handler) handleSecretsList(ctx context.Context, ar *activeRequest) error {
671650
l := logger.With(h.lggr, "method", ar.req.Method, "requestID", ar.req.ID)
672651

core/services/llo/channeldefinitions/onchain_channel_definition_cache.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ type HTTPClient interface {
184184
// sets up the initial state, and applies any provided options. The cache must be started via Start()
185185
// before it begins polling and fetching definitions.
186186
func NewChannelDefinitionCache(lggr logger.Logger, orm ChannelDefinitionCacheORM, client HTTPClient, lp logpoller.LogPoller, addr common.Address, donID uint32, fromBlock int64, options ...Option) llotypes.ChannelDefinitionCache {
187-
188187
cdc := &channelDefinitionCache{
189188
orm: orm,
190189
client: client,

core/services/llo/observation/data_source.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ func (d *dataSource) Observe(ctx context.Context, streamValues llo.StreamValues,
137137
// Based on the expected maxObservationDuration determine the pace of the observation loop
138138
// and for how long to cache the observations.
139139
func (d *dataSource) startObservationLoop(loopStartedCh chan struct{}) {
140-
141140
// atomically set the observation loop started flag to true
142141
// or return if it's already started
143142
if !d.observationLoopStarted.CompareAndSwap(false, true) {

0 commit comments

Comments
 (0)