update golangci-lint rules (#252)

smartcontractkit · Nov 22, 2023 · 6953c5a · 6953c5a
1 parent d7f28e9
commit 6953c5a
Show file tree

Hide file tree

Showing 50 changed files with 81 additions and 100 deletions.
diff --git a/.github/workflows/golangci_lint.yml b/.github/workflows/golangci_lint.yml
@@ -15,7 +15,7 @@ jobs:
           go-version: '1.21'
 
       - name: Install golangci-lint
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
+        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
 
       # go.work makes it necessary to run linter manually
       - name: Run golangci-lint

diff --git a/.golangci.yml b/.golangci.yml
@@ -10,6 +10,10 @@ linters:
     - misspell
     - rowserrcheck
     - errorlint
+    - unconvert
+    - sqlclosecheck
+    - noctx
+    - whitespace
 linters-settings:
   exhaustive:
     default-signifies-exhaustive: true
@@ -40,9 +44,10 @@ linters-settings:
       - name: error-return
       - name: error-strings
       - name: error-naming
+      - name: exported
       - name: if-return
       - name: increment-decrement
-      # - name: var-naming
+      - name: var-naming
       - name: var-declaration
       - name: package-comments
       - name: range

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 golang 1.21.1
-golangci-lint 1.54.2
+golangci-lint 1.55.2
diff --git a/Makefile b/Makefile
@@ -17,8 +17,7 @@ install-protoc:
 mockery: $(mockery) ## Install mockery.
 	go install github.com/vektra/mockery/v2@v2.28.1
 
-PHONY: generate
-
+.PHONY: generate
 generate: mockery install-protoc
 # add our installed protoc to the head of the PATH
 # maybe there is a cleaner way to do this
@@ -27,4 +26,4 @@ generate: mockery install-protoc
 .PHONY: golangci-lint
 golangci-lint: ## Run golangci-lint for all issues.
 	[ -d "./golangci-lint" ] || mkdir ./golangci-lint && \
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.54.2 golangci-lint run --max-issues-per-linter 0 --max-same-issues 0 > ./golangci-lint/$(shell date +%Y-%m-%d_%H:%M:%S).txt
+	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.55.2 golangci-lint run --max-issues-per-linter 0 --max-same-issues 0 > ./golangci-lint/$(shell date +%Y-%m-%d_%H:%M:%S).txt
diff --git a/pkg/chains/nodes.go b/pkg/chains/nodes.go
@@ -90,8 +90,8 @@ func ListNodeStatuses(pageSize int, pageTokenStr string, listFn ListNodeStatusFn
 		return stats, "", -1, err
 	}
 	if total > end {
-		next_token := &pageToken{Page: t.Page + 1, Size: t.Size}
-		nextPageToken = next_token.Encode()
+		nextToken := &pageToken{Page: t.Page + 1, Size: t.Size}
+		nextPageToken = nextToken.Encode()
 	}
 	return stats, nextPageToken, total, nil
 }
diff --git a/pkg/chains/nodes_test.go b/pkg/chains/nodes_test.go
@@ -153,13 +153,13 @@ func TestListNodeStatuses(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotStats, gotNext_pageToken, gotTotal, err := ListNodeStatuses(tt.args.pageSize, tt.args.pageToken, tt.args.listFn)
+			gotStats, gotNextPageToken, gotTotal, err := ListNodeStatuses(tt.args.pageSize, tt.args.pageToken, tt.args.listFn)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ListNodeStatuses() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			assert.Equal(t, tt.wantStats, gotStats)
-			assert.Equal(t, tt.wantNextPageToken, gotNext_pageToken)
+			assert.Equal(t, tt.wantNextPageToken, gotNextPageToken)
 			assert.Equal(t, tt.wantTotal, gotTotal)
 		})
 	}

diff --git a/pkg/config/duration.go b/pkg/config/duration.go
@@ -47,7 +47,7 @@ func (d *Duration) UnmarshalJSON(input []byte) error {
 	if err != nil {
 		return err
 	}
-	v, err := time.ParseDuration(string(txt))
+	v, err := time.ParseDuration(txt)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/loop/adapters/starknet/signature.go b/pkg/loop/adapters/starknet/signature.go
@@ -15,7 +15,6 @@ type Signature struct {
 
 func (s *Signature) Bytes() ([]byte, error) {
 	return proto.Marshal(s.sig)
-
 }
 
 func (s *Signature) Ints() (x *big.Int, y *big.Int, err error) {
@@ -41,7 +40,6 @@ func SignatureFromBytes(b []byte) (*Signature, error) {
 
 // x,y must be non-negative numbers
 func SignatureFromBigInts(x *big.Int, y *big.Int) (*Signature, error) {
-
 	if x.Cmp(big.NewInt(0)) < 0 || y.Cmp(big.NewInt(0)) < 0 {
 		return nil, fmt.Errorf("Cannot create signature from negative values (x,y), (%v, %v)", x, y)
 	}
@@ -53,5 +51,4 @@ func SignatureFromBigInts(x *big.Int, y *big.Int) (*Signature, error) {
 	return &Signature{
 		sig: starkPb,
 	}, nil
-
 }
diff --git a/pkg/loop/adapters/starknet/signature_test.go b/pkg/loop/adapters/starknet/signature_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 func TestSignature(t *testing.T) {
-
 	s, err := SignatureFromBigInts(big.NewInt(7),
 		big.NewInt(11))
 

diff --git a/pkg/loop/internal/broker.go b/pkg/loop/internal/broker.go
@@ -39,7 +39,7 @@ func (a *atomicBroker) DialWithOptions(id uint32, opts ...grpc.DialOption) (conn
 	return a.load().DialWithOptions(id, opts...)
 }
 
-func (a *atomicBroker) NextId() uint32 {
+func (a *atomicBroker) NextId() uint32 { //nolint:revive
 	return a.load().NextId()
 }
 

diff --git a/pkg/loop/internal/median.go b/pkg/loop/internal/median.go
@@ -259,7 +259,6 @@ type reportCodecServer struct {
 func (r *reportCodecServer) BuildReport(ctx context.Context, request *pb.BuildReportRequest) (*pb.BuildReportReply, error) {
 	var obs []median.ParsedAttributedObservation
 	for _, o := range request.Observations {
-
 		val, jpfc := o.Value.Int(), o.JulesPerFeeCoin.Int()
 		if o.Observer > math.MaxUint8 {
 			return nil, fmt.Errorf("expected uint8 Observer (max %d) but got %d", math.MaxUint8, o.Observer)

diff --git a/pkg/loop/internal/pipeline_runner.go b/pkg/loop/internal/pipeline_runner.go
@@ -110,5 +110,4 @@ func (p *pipelineRunnerServiceServer) ExecuteRun(ctx context.Context, rr *pb.Run
 	return &pb.RunResponse{
 		Results: taskResults,
 	}, nil
-
 }
diff --git a/pkg/loop/internal/pipeline_runner_test.go b/pkg/loop/internal/pipeline_runner_test.go
@@ -62,7 +62,7 @@ func TestPipelineRunnerService(t *testing.T) {
 		context.Background(),
 		"my-spec",
 		types.Vars{Vars: map[string]interface{}{"my-vars": true}},
-		types.Options{MaxTaskDuration: time.Duration(10 * time.Second)},
+		types.Options{MaxTaskDuration: 10 * time.Second},
 	)
 	require.NoError(t, err)
 	assert.ElementsMatch(t, originalResults, trs)
@@ -78,7 +78,7 @@ func TestPipelineRunnerService_CallArgs(t *testing.T) {
 		Vars: map[string]interface{}{"my-vars": true},
 	}
 	options := types.Options{
-		MaxTaskDuration: time.Duration(10 * time.Second),
+		MaxTaskDuration: 10 * time.Second,
 	}
 	_, err := client.ExecuteRun(context.Background(), spec, vars, options)
 	require.NoError(t, err)

diff --git a/pkg/loop/internal/relayer.go b/pkg/loop/internal/relayer.go
@@ -232,7 +232,7 @@ func (r *relayerClient) GetChainStatus(ctx context.Context) (types.ChainStatus,
 	}, nil
 }
 
-func (r *relayerClient) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) (nodes []types.NodeStatus, next_page_token string, total int, err error) {
+func (r *relayerClient) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) (nodes []types.NodeStatus, nextPageToken string, total int, err error) {
 	reply, err := r.relayer.ListNodeStatuses(ctx, &pb.ListNodeStatusesRequest{
 		PageSize:  pageSize,
 		PageToken: pageToken,
@@ -417,7 +417,7 @@ func (r *relayerServer) GetChainStatus(ctx context.Context, request *pb.GetChain
 }
 
 func (r *relayerServer) ListNodeStatuses(ctx context.Context, request *pb.ListNodeStatusesRequest) (*pb.ListNodeStatusesReply, error) {
-	nodeConfigs, next_page_token, total, err := r.impl.ListNodeStatuses(ctx, request.PageSize, request.PageToken)
+	nodeConfigs, nextPageToken, total, err := r.impl.ListNodeStatuses(ctx, request.PageSize, request.PageToken)
 	if err != nil {
 		return nil, err
 	}
@@ -430,7 +430,7 @@ func (r *relayerServer) ListNodeStatuses(ctx context.Context, request *pb.ListNo
 			State:   n.State,
 		})
 	}
-	return &pb.ListNodeStatusesReply{Nodes: nodes, NextPageToken: next_page_token, Total: int32(total)}, nil
+	return &pb.ListNodeStatusesReply{Nodes: nodes, NextPageToken: nextPageToken, Total: int32(total)}, nil
 }
 func (r *relayerServer) Transact(ctx context.Context, request *pb.TransactionRequest) (*emptypb.Empty, error) {
 	return &emptypb.Empty{}, r.impl.Transact(ctx, request.From, request.To, request.Amount.Int(), request.BalanceCheck)

diff --git a/pkg/loop/internal/test/median.go b/pkg/loop/internal/test/median.go
@@ -19,7 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 )
 
-func TestPluginMedian(t *testing.T, p types.PluginMedian) {
+func PluginMedian(t *testing.T, p types.PluginMedian) {
 	PluginMedianTest{&StaticMedianProvider{}}.TestPluginMedian(t, p)
 }
 
@@ -33,11 +33,11 @@ func (m PluginMedianTest) TestPluginMedian(t *testing.T, p types.PluginMedian) {
 		factory, err := p.NewMedianFactory(ctx, m.MedianProvider, &staticDataSource{value}, &staticDataSource{juelsPerFeeCoin}, &StaticErrorLog{})
 		require.NoError(t, err)
 
-		TestReportingPluginFactory(t, factory)
+		ReportingPluginFactory(t, factory)
 	})
 }
 
-func TestReportingPluginFactory(t *testing.T, factory types.ReportingPluginFactory) {
+func ReportingPluginFactory(t *testing.T, factory types.ReportingPluginFactory) {
 	t.Run("ReportingPluginFactory", func(t *testing.T) {
 		rp, gotRPI, err := factory.NewReportingPlugin(reportingPluginConfig)
 		require.NoError(t, err)
@@ -63,7 +63,6 @@ func TestReportingPluginFactory(t *testing.T, factory types.ReportingPluginFacto
 			assert.True(t, gotShouldTransmit)
 		})
 	})
-
 }
 
 type StaticPluginMedian struct{}

diff --git a/pkg/loop/internal/test/relayer.go b/pkg/loop/internal/test/relayer.go
@@ -102,13 +102,11 @@ func (s staticRelayer) GetChainStatus(ctx context.Context) (types.ChainStatus, e
 }
 
 func (s staticRelayer) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) ([]types.NodeStatus, string, int, error) {
-
 	if limit != pageSize {
 		return nil, "", -1, fmt.Errorf("expected page_size %d but got %d", limit, pageSize)
 	}
 	if pageToken != "" {
 		return nil, "", -1, fmt.Errorf("expected empty page_token but got %q", pageToken)
-
 	}
 	return nodes, "", total, nil
 }
@@ -148,19 +146,19 @@ func newRelayArgsWithProviderType(_type types.OCR2PluginType) types.RelayArgs {
 	}
 }
 
-func TestPluginRelayer(t *testing.T, p internal.PluginRelayer) {
+func RunPluginRelayer(t *testing.T, p internal.PluginRelayer) {
 	ctx := tests.Context(t)
 
 	t.Run("Relayer", func(t *testing.T) {
 		relayer, err := p.NewRelayer(ctx, ConfigTOML, StaticKeystore{})
 		require.NoError(t, err)
 		require.NoError(t, relayer.Start(ctx))
 		t.Cleanup(func() { assert.NoError(t, relayer.Close()) })
-		TestRelayer(t, relayer)
+		RunRelayer(t, relayer)
 	})
 }
 
-func TestRelayer(t *testing.T, relayer internal.Relayer) {
+func RunRelayer(t *testing.T, relayer internal.Relayer) {
 	ctx := tests.Context(t)
 
 	t.Run("ConfigProvider", func(t *testing.T) {

diff --git a/pkg/loop/median_service_test.go b/pkg/loop/median_service_test.go
@@ -26,7 +26,7 @@ func TestMedianService(t *testing.T) {
 	t.Cleanup(func() { assert.NoError(t, median.Close()) })
 
 	t.Run("control", func(t *testing.T) {
-		test.TestReportingPluginFactory(t, median)
+		test.ReportingPluginFactory(t, median)
 	})
 
 	t.Run("Kill", func(t *testing.T) {
@@ -35,7 +35,7 @@ func TestMedianService(t *testing.T) {
 		// wait for relaunch
 		time.Sleep(2 * internal.KeepAliveTickDuration)
 
-		test.TestReportingPluginFactory(t, median)
+		test.ReportingPluginFactory(t, median)
 	})
 
 	t.Run("Reset", func(t *testing.T) {
@@ -44,7 +44,7 @@ func TestMedianService(t *testing.T) {
 		// wait for relaunch
 		time.Sleep(2 * internal.KeepAliveTickDuration)
 
-		test.TestReportingPluginFactory(t, median)
+		test.ReportingPluginFactory(t, median)
 	})
 }
 
@@ -61,5 +61,5 @@ func TestMedianService_recovery(t *testing.T) {
 	require.NoError(t, median.Start(tests.Context(t)))
 	t.Cleanup(func() { assert.NoError(t, median.Close()) })
 
-	test.TestReportingPluginFactory(t, median)
+	test.ReportingPluginFactory(t, median)
 }
diff --git a/pkg/loop/plugin_median_test.go b/pkg/loop/plugin_median_test.go
@@ -19,7 +19,7 @@ func TestPluginMedian(t *testing.T) {
 	t.Parallel()
 
 	stopCh := newStopCh(t)
-	test.PluginTest(t, loop.PluginMedianName, &loop.GRPCPluginMedian{PluginServer: test.StaticPluginMedian{}, BrokerConfig: loop.BrokerConfig{Logger: logger.Test(t), StopCh: stopCh}}, test.TestPluginMedian)
+	test.PluginTest(t, loop.PluginMedianName, &loop.GRPCPluginMedian{PluginServer: test.StaticPluginMedian{}, BrokerConfig: loop.BrokerConfig{Logger: logger.Test(t), StopCh: stopCh}}, test.PluginMedian)
 
 	t.Run("proxy", func(t *testing.T) {
 		test.PluginTest(t, loop.PluginRelayerName, &loop.GRPCPluginRelayer{PluginServer: test.StaticPluginRelayer{}, BrokerConfig: loop.BrokerConfig{Logger: logger.Test(t), StopCh: stopCh}}, func(t *testing.T, pr loop.PluginRelayer) {
@@ -45,7 +45,7 @@ func TestPluginMedianExec(t *testing.T) {
 	i, err := client.Dispense(loop.PluginMedianName)
 	require.NoError(t, err)
 
-	test.TestPluginMedian(t, i.(types.PluginMedian))
+	test.PluginMedian(t, i.(types.PluginMedian))
 
 	t.Run("proxy", func(t *testing.T) {
 		pr := newPluginRelayerExec(t, stopCh)

diff --git a/pkg/loop/plugin_relayer_test.go b/pkg/loop/plugin_relayer_test.go
@@ -15,7 +15,7 @@ func TestPluginRelayer(t *testing.T) {
 	t.Parallel()
 
 	stopCh := newStopCh(t)
-	test.PluginTest(t, loop.PluginRelayerName, &loop.GRPCPluginRelayer{PluginServer: test.StaticPluginRelayer{}, BrokerConfig: loop.BrokerConfig{Logger: logger.Test(t), StopCh: stopCh}}, test.TestPluginRelayer)
+	test.PluginTest(t, loop.PluginRelayerName, &loop.GRPCPluginRelayer{PluginServer: test.StaticPluginRelayer{}, BrokerConfig: loop.BrokerConfig{Logger: logger.Test(t), StopCh: stopCh}}, test.RunPluginRelayer)
 }
 
 func TestPluginRelayerExec(t *testing.T) {
@@ -24,7 +24,7 @@ func TestPluginRelayerExec(t *testing.T) {
 
 	pr := newPluginRelayerExec(t, stopCh)
 
-	test.TestPluginRelayer(t, pr)
+	test.RunPluginRelayer(t, pr)
 }
 
 func newPluginRelayerExec(t *testing.T, stopCh <-chan struct{}) loop.PluginRelayer {

diff --git a/pkg/loop/prom.go b/pkg/loop/prom.go
@@ -74,7 +74,6 @@ func (p *PromServer) Start() error {
 		} else {
 			p.lggr.Errorf("%s: %s", p.Name(), err)
 		}
-
 	}()
 	return nil
 }

diff --git a/pkg/loop/prom_test.go b/pkg/loop/prom_test.go
@@ -15,7 +15,6 @@ import (
 )
 
 func TestPromServer(t *testing.T) {
-
 	testReg := prometheus.NewRegistry()
 	testHandler := promhttp.HandlerFor(testReg, promhttp.HandlerOpts{})
 	testMetric := prometheus.NewCounter(prometheus.CounterOpts{

diff --git a/pkg/loop/relayer_service_test.go b/pkg/loop/relayer_service_test.go
@@ -26,7 +26,7 @@ func TestRelayerService(t *testing.T) {
 	t.Cleanup(func() { assert.NoError(t, relayer.Close()) })
 
 	t.Run("control", func(t *testing.T) {
-		test.TestRelayer(t, relayer)
+		test.RunRelayer(t, relayer)
 	})
 
 	t.Run("Kill", func(t *testing.T) {
@@ -35,7 +35,7 @@ func TestRelayerService(t *testing.T) {
 		// wait for relaunch
 		time.Sleep(2 * internal.KeepAliveTickDuration)
 
-		test.TestRelayer(t, relayer)
+		test.RunRelayer(t, relayer)
 	})
 
 	t.Run("Reset", func(t *testing.T) {
@@ -44,7 +44,7 @@ func TestRelayerService(t *testing.T) {
 		// wait for relaunch
 		time.Sleep(2 * internal.KeepAliveTickDuration)
 
-		test.TestRelayer(t, relayer)
+		test.RunRelayer(t, relayer)
 	})
 }
 
@@ -61,5 +61,5 @@ func TestRelayerService_recovery(t *testing.T) {
 	require.NoError(t, relayer.Start(tests.Context(t)))
 	t.Cleanup(func() { assert.NoError(t, relayer.Close()) })
 
-	test.TestRelayer(t, relayer)
+	test.RunRelayer(t, relayer)
 }
diff --git a/pkg/loop/reportingplugins/grpc_test.go b/pkg/loop/reportingplugins/grpc_test.go
@@ -28,7 +28,7 @@ func PluginGenericTest(t *testing.T, p types.ReportingPluginClient) {
 		factory, err := p.NewReportingPluginFactory(ctx, types.ReportingPluginServiceConfig{}, test.MockConn{}, &test.StaticPipelineRunnerService{}, &test.StaticTelemetry{}, &test.StaticErrorLog{})
 		require.NoError(t, err)
 
-		test.TestReportingPluginFactory(t, factory)
+		test.ReportingPluginFactory(t, factory)
 	})
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ import ( @@
     )
     func TestSignature(t *testing.T) {
     	s, err := SignatureFromBigInts(big.NewInt(7),
     		big.NewInt(11))
@@ Expand Down @@