Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(lint): upgrade golangci-lint to 1.56 and fix revive errors that emerged #3247

Merged
merged 4 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: golangci/golangci-lint-action@v4.0.0
with:
args: --timeout 10m
version: v1.55
version: v1.56
skip-pkg-cache: true
skip-build-cache: true

Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ issues:
- path: _test\.go
linters:
- gosec
- revive
- linters:
- lll
source: "https://"
Expand Down
4 changes: 3 additions & 1 deletion api/docgen/openrpc.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Package docgen generates an OpenRPC spec for the Celestia Node. It has been inspired by and
// adapted from Filecoin's Lotus API implementation.

//nolint:revive
package docgen

import (
Expand Down Expand Up @@ -95,7 +97,7 @@ func NewOpenRPCDocument(comments Comments, permissions Comments) *go_openrpc_ref

d.WithMeta(&go_openrpc_reflect.MetaT{
GetServersFn: func() func(listeners []net.Listener) (*meta_schema.Servers, error) {
return func(listeners []net.Listener) (*meta_schema.Servers, error) {
return func(_ []net.Listener) (*meta_schema.Servers, error) {
return nil, nil
}
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/cel-shed/eds_store_stress.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var edsStoreStress = &cobra.Command{
Use: "stress",
Short: `Runs eds.Store stress test over default node.Store Datastore backend (e.g. Badger).`,
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) (err error) {
RunE: func(cmd *cobra.Command, _ []string) (err error) {
// expose expvar vars over http
go http.ListenAndServe(":9999", http.DefaultServeMux) //nolint:errcheck,gosec

Expand Down
4 changes: 2 additions & 2 deletions cmd/cel-shed/p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var p2pCmd = &cobra.Command{
var p2pNewKeyCmd = &cobra.Command{
Use: "new-key",
Short: "Generate and print new Ed25519 private key for p2p networking",
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error { //nolint:revive
privkey, _, err := crypto.GenerateEd25519Key(rand.Reader)
if err != nil {
return err
Expand All @@ -42,7 +42,7 @@ var p2pNewKeyCmd = &cobra.Command{
var p2pPeerIDCmd = &cobra.Command{
Use: "peer-id",
Short: "Get peer-id out of public or private Ed25519 key",
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, args []string) error { //nolint:revive
decKey, err := hex.DecodeString(args[0])
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func RemoveConfigCmd(fsets ...*flag.FlagSet) *cobra.Command {
Use: "config-remove",
Short: "Deletes the node's config",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
return nodebuilder.RemoveConfig(StorePath(ctx))
},
Expand All @@ -31,7 +31,7 @@ func UpdateConfigCmd(fsets ...*flag.FlagSet) *cobra.Command {
Long: "Updates the node's outdated config with default values from newly-added fields. Check the config " +
" afterwards to ensure all old custom values were preserved.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
return nodebuilder.UpdateConfig(NodeType(ctx), StorePath(ctx))
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/docgen/openrpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
var rootCmd = &cobra.Command{
Use: "docgen [packages]",
Short: "docgen generates the openrpc documentation for Celestia Node packages",
RunE: func(cmd *cobra.Command, moduleNames []string) error {
RunE: func(_ *cobra.Command, moduleNames []string) error {
// 1. Open the respective nodebuilder/X/service.go files for AST parsing
nodeComments, permComments := docgen.ParseCommentsFromNodebuilderModules(moduleNames...)

Expand Down
2 changes: 1 addition & 1 deletion cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func Init(fsets ...*flag.FlagSet) *cobra.Command {
Use: "init",
Short: "Initialization for Celestia Node. Passed flags have persisted effect.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()

return nodebuilder.Init(NodeConfig(ctx), StorePath(ctx), NodeType(ctx))
Expand Down
2 changes: 1 addition & 1 deletion cmd/reset_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func ResetStore(fsets ...*flag.FlagSet) *cobra.Command {
Use: "unsafe-reset-store",
Short: "Resets the node's store to a new state. Leaves the keystore and config intact.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()

return nodebuilder.Reset(StorePath(ctx), NodeType(ctx))
Expand Down
2 changes: 1 addition & 1 deletion cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Options passed on start override configuration options only on start and are not
Aliases: []string{"run", "daemon"},
Args: cobra.NoArgs,
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) (err error) {
RunE: func(cmd *cobra.Command, _ []string) (err error) {
ctx := cmd.Context()

// override config with all modifiers passed on start
Expand Down
4 changes: 2 additions & 2 deletions nodebuilder/core/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ func ConstructModule(tp node.Type, cfg *Config, options ...fx.Option) fx.Option
)),
fx.Provide(fx.Annotate(
remote,
fx.OnStart(func(ctx context.Context, client core.Client) error {
fx.OnStart(func(_ context.Context, client core.Client) error {
return client.Start()
}),
fx.OnStop(func(ctx context.Context, client core.Client) error {
fx.OnStop(func(_ context.Context, client core.Client) error {
return client.Stop()
}),
)),
Expand Down
2 changes: 1 addition & 1 deletion nodebuilder/das/cmd/das.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var samplingStatsCmd = &cobra.Command{
Use: "sampling-stats",
Short: "Returns the current statistics over the DA sampling process",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions nodebuilder/header/cmd/header.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var localHeadCmd = &cobra.Command{
Use: "local-head",
Short: "Returns the ExtendedHeader from the chain head.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand All @@ -47,7 +47,7 @@ var networkHeadCmd = &cobra.Command{
Use: "network-head",
Short: "Provides the Syncer's view of the current network head.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down Expand Up @@ -104,7 +104,7 @@ var syncStateCmd = &cobra.Command{
Use: "sync-state",
Short: "Returns the current state of the header Syncer.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion nodebuilder/node/cmd/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var nodeInfoCmd = &cobra.Command{
Use: "info",
Args: cobra.NoArgs,
Short: "Returns administrative information about the node.",
RunE: func(c *cobra.Command, args []string) error {
RunE: func(c *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(c.Context())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion nodebuilder/node/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func WithMetrics() error {
return err
}

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
if !nodeStarted {
// Observe node start timestamp
timeStarted = time.Now()
Expand Down
2 changes: 1 addition & 1 deletion nodebuilder/p2p/bitswap.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func dataExchange(params bitSwapParams) exchange.Interface {
net.Start(srvr, clnt) // starting with hook does not work

params.Lifecycle.Append(fx.Hook{
OnStop: func(ctx context.Context) (err error) {
OnStop: func(_ context.Context) (err error) {
err = errors.Join(err, clnt.Close())
err = errors.Join(err, srvr.Close())
net.Stop()
Expand Down
10 changes: 5 additions & 5 deletions nodebuilder/p2p/cmd/p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var infoCmd = &cobra.Command{
Use: "info",
Short: "Gets the node's peer info (peer id and multiaddresses)",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down Expand Up @@ -77,7 +77,7 @@ var peersCmd = &cobra.Command{
Use: "peers",
Short: "Lists the peers we are connected to",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down Expand Up @@ -226,7 +226,7 @@ var natStatusCmd = &cobra.Command{
Use: "nat-status",
Short: "Gets the current NAT status",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down Expand Up @@ -328,7 +328,7 @@ var blockedPeersCmd = &cobra.Command{
Use: "blocked-peers",
Short: "Lists the node's blocked peers",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down Expand Up @@ -466,7 +466,7 @@ var bandwidthStatsCmd = &cobra.Command{
Long: "Get stats struct with bandwidth metrics for all data sent/" +
"received by the local peer, regardless of protocol or remote peer IDs",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion nodebuilder/p2p/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func prometheusMetrics(lifecycle fx.Lifecycle, registerer prometheus.Registerer)
}

lifecycle.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
OnStart: func(_ context.Context) error {
go func() {
if err := promHTTPServer.ListenAndServe(); err != nil {
log.Errorf("Error starting Prometheus metrics exporter http server: %s", err)
Expand Down
4 changes: 2 additions & 2 deletions nodebuilder/share/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func ConstructModule(tp node.Type, cfg *Config, options ...fx.Option) fx.Option

func discoveryComponents(cfg *Config) fx.Option {
return fx.Options(
fx.Invoke(func(disc *disc.Discovery) {}),
fx.Invoke(func(_ *disc.Discovery) {}),
fx.Provide(fx.Annotate(
newDiscovery(cfg.Discovery),
fx.OnStart(func(ctx context.Context, d *disc.Discovery) error {
Expand Down Expand Up @@ -189,7 +189,7 @@ func shrexGetterComponents(cfg *Config) fx.Option {

func shrexServerComponents(cfg *Config) fx.Option {
return fx.Options(
fx.Invoke(func(edsSrv *shrexeds.Server, ndSrc *shrexnd.Server) {}),
fx.Invoke(func(_ *shrexeds.Server, _ *shrexnd.Server) {}),
fx.Provide(fx.Annotate(
func(host host.Host, store *eds.Store, network modp2p.Network) (*shrexeds.Server, error) {
cfg.ShrExEDSParams.WithNetworkID(network.String())
Expand Down
4 changes: 2 additions & 2 deletions nodebuilder/state/cmd/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var accountAddressCmd = &cobra.Command{
Use: "account-address",
Short: "Retrieves the address of the node's account/signer.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand All @@ -57,7 +57,7 @@ var balanceCmd = &cobra.Command{
Short: "Retrieves the Celestia coin balance for the node's account/signer and verifies it against " +
"the corresponding block's AppHash.",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
client, err := cmdnode.ParseClientFromCtx(cmd.Context())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion share/eds/cache/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func newMetrics(bc *AccessorCache) (*metrics, error) {
return nil, err
}

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
observer.ObserveInt64(cacheSize, int64(bc.cache.Len()))
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion share/eds/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (s *Store) WithMetrics() error {
return err
}

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
stats := s.dgstr.Stats()
for status, amount := range stats {
observer.ObserveInt64(dagStoreShards, int64(amount),
Expand Down
2 changes: 1 addition & 1 deletion share/p2p/discovery/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func initMetrics(d *Discovery) (*metrics, error) {
peerRemoved: peerRemoved,
}

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
observer.ObserveInt64(peersAmount, int64(d.set.Size()))
observer.ObserveInt64(backOffSize, int64(d.connector.Size()))
return nil
Expand Down
2 changes: 1 addition & 1 deletion share/p2p/peers/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func initMetrics(manager *Manager) (*metrics, error) {
blacklistedPeers: blacklisted,
}

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
for poolStatus, count := range manager.shrexPools() {
observer.ObserveInt64(shrexPools, count,
metric.WithAttributes(
Expand Down
2 changes: 1 addition & 1 deletion state/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func WithMetrics(ca *CoreAccessor) {
metric.WithDescription("Timestamp of the last submitted PayForBlob transaction"),
)

callback := func(ctx context.Context, observer metric.Observer) error {
callback := func(_ context.Context, observer metric.Observer) error {
observer.ObserveInt64(pfbCounter, ca.PayForBlobCount())
observer.ObserveInt64(lastPfbTimestamp, ca.LastPayForBlob())
return nil
Expand Down
Loading