fix golangci-lint errors

Author: angaz

cmd/crawler/api.go

@@ -46,7 +46,7 @@ func runAPI(cCtx *cli.Context) error {
 
 	enodes, err := readEnodes(cCtx)
 	if err != nil {
-		return fmt.Errorf("Read enodes failed: %w", err)
+		return fmt.Errorf("read enodes failed: %w", err)
 	}
 
 	// Start the API deamon

cmd/crawler/gen_keys_cmd.go

@@ -23,19 +23,19 @@ func genkeysAction(cCtx *cli.Context) error {
 	args := cCtx.Args()
 
 	if args.Len() == 0 {
-		return fmt.Errorf("At least one positional argument is required: Number of keys to generate.")
+		return fmt.Errorf("at least one positional argument is required: Number of keys to generate")
 	}
 	if args.Len() > 2 {
-		return fmt.Errorf("Too many positional arguments. Give at most two.")
+		return fmt.Errorf("too many positional arguments. give at most two")
 	}
 
 	nKeys, err := strconv.Atoi(args.Get(0))
 	if err != nil {
-		return fmt.Errorf("Parse number of keys parameter failed: %w.", err)
+		return fmt.Errorf("parse number of keys parameter failed: %w", err)
 	}
 
 	if nKeys == 0 {
-		return fmt.Errorf("0 is not a valid number of keys to generate.")
+		return fmt.Errorf("0 is not a valid number of keys to generate")
 	}
 
 	// Default to write to stdout if FILE not given
@@ -47,7 +47,7 @@ func genkeysAction(cCtx *cli.Context) error {
 
 	_, err = common.WriteNodeKeys(nKeys, filename)
 	if err != nil {
-		return fmt.Errorf("Write keys failed: %w.", err)
+		return fmt.Errorf("write keys failed: %w", err)
 	}
 
 	return nil

cmd/crawler/print_enode.go

@@ -31,12 +31,12 @@ func printEnodesAction(cCtx *cli.Context) error {
 
 	startPort, err := strconv.Atoi(args.Get(2))
 	if err != nil {
-		return fmt.Errorf("Parsing start port failed: %w", err)
+		return fmt.Errorf("parsing start port failed: %w", err)
 	}
 
 	nodeKeys, err := common.ReadNodeKeys(nodeFile)
 	if err != nil {
-		return fmt.Errorf("Reading node keys file failed: %w", err)
+		return fmt.Errorf("reading node keys file failed: %w", err)
 	}
 
 	for i, nodeKey := range nodeKeys {

cmd/crawler/utils.go

@@ -1,16 +1,13 @@
 package main
 
 import (
-	"crypto/ecdsa"
 	"database/sql"
-	"errors"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 
 	"github.com/angaz/sqlu"
-	"github.com/ethereum/node-crawler/pkg/common"
 	"github.com/ethereum/node-crawler/pkg/database"
 	"github.com/urfave/cli/v2"
 )
@@ -116,26 +113,3 @@ func openDBReader(cCtx *cli.Context) (*database.DB, error) {
 
 	return db, nil
 }
-
-func readNodeKeys(cCtx *cli.Context, nodeKeysFileName string) ([]*ecdsa.PrivateKey, error) {
-	_, err := os.Stat(nodeKeysFileName)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			keys, err := common.WriteNodeKeys(16, nodeKeysFileName)
-			if err != nil {
-				return nil, fmt.Errorf("Writing node keys file failed: %w", err)
-			}
-
-			return keys, nil
-		}
-
-		return nil, fmt.Errorf("Reading node keys file failed: %w", err)
-	}
-
-	keys, err := common.ReadNodeKeys(nodeKeysFileName)
-	if err != nil {
-		return nil, fmt.Errorf("Read node keys file failed: %w", err)
-	}
-
-	return keys, nil
-}

pkg/consensus/crawler/crawler.go

@@ -83,10 +83,10 @@ func (c *Crawler) Wait() {
 	c.wg.Wait()
 }
 
-func (_ *Crawler) Close() {}
+func (*Crawler) Close() {}
 
 func (c *Crawler) StartDeamon(ctx context.Context, workers int) error {
-	for i := 0; i < workers; i++ {
+	for range workers {
 		c.wg.Add(1)
 		c.crawler(ctx)
 	}
@@ -100,7 +100,7 @@ func (c *Crawler) randomHost() *consensusHost {
 	return c.hosts[idx]
 }
 
-func (c *Crawler) crawlNode(ctx context.Context, tx pgx.Tx, node *enode.Node) error {
+func (c *Crawler) crawlNode(ctx context.Context, _ pgx.Tx, node *enode.Node) error {
 	consensusNode, err := GetClientInfo(ctx, c.randomHost().host, node)
 	if err != nil {
 		return fmt.Errorf("get client info: %w", err)
@@ -397,7 +397,7 @@ var errExcessMaxLength = errors.Errorf("provided header exceeds the max varint l
 func readVarint(r io.Reader) (uint64, error) {
 	varintBuf := make([]byte, 0, maxVarintLength)
 
-	for i := 0; i < maxVarintLength; i++ {
+	for range maxVarintLength {
 		oneByte := [1]byte{0}
 
 		n, err := r.Read(oneByte[:])

pkg/database/api.go

@@ -266,7 +266,7 @@ func (db *DB) EphemeryNetworks(ctx context.Context) ([]EphemeryNetwork, error) {
 		return nil, fmt.Errorf("query: %w", err)
 	}
 
-	networks, err := pgx.CollectRows[EphemeryNetwork](rows, func(row pgx.CollectableRow) (EphemeryNetwork, error) {
+	networks, err := pgx.CollectRows(rows, func(row pgx.CollectableRow) (EphemeryNetwork, error) {
 		var network EphemeryNetwork
 
 		err := row.Scan(
@@ -790,18 +790,6 @@ func statsTempTable(tempTableName string, fromTableName string, instant bool) st
 	return builder.String()
 }
 
-func mergeNamedArgs(namedArgs ...pgx.NamedArgs) pgx.NamedArgs {
-	outNamedArgs := make(pgx.NamedArgs)
-
-	for _, args := range namedArgs {
-		for key, value := range args {
-			outNamedArgs[key] = value
-		}
-	}
-
-	return outNamedArgs
-}
-
 //	{
 //	  "stats": [
 //	    {

pkg/database/disc.go

@@ -30,7 +30,7 @@ type rowQuerier interface {
 	QueryRow(context.Context, string, ...any) pgx.Row
 }
 
-func (_ *DB) selectBestRecord(ctx context.Context, db rowQuerier, node *enode.Node) (*enr.Record, error) {
+func (*DB) selectBestRecord(ctx context.Context, db rowQuerier, node *enode.Node) (*enr.Record, error) {
 	var savedRecordBytes []byte
 	var savedRecord *enr.Record
 

pkg/database/stats.go

@@ -367,7 +367,7 @@ func (ts Timeseries) Percentage() Timeseries {
 	}
 
 	for i := 0; i < len(ts.Series[0].Data); i++ {
-		var total float64 = 0.0
+		var total = 0.0
 
 		for _, series := range ts.Series {
 			value := series.Data[i]

pkg/execution/crawler/crawler.go

@@ -50,7 +50,7 @@ func (c *Crawler) Wait() {
 func (c *Crawler) Close() {}
 
 func (c *Crawler) StartDaemon(ctx context.Context, workers int) error {
-	for i := 0; i < workers; i++ {
+	for range workers {
 		c.wg.Add(1)
 		go c.crawler(ctx)
 	}

pkg/execution/disc/daemon.go

@@ -204,7 +204,7 @@ func (d *Discovery) crawlNode(ctx context.Context, tx pgx.Tx, node *enode.Node)
 }
 
 func closestDisc(discs []*Discovery, nodeID enode.ID) *Discovery {
-	var lastDisc *Discovery = discs[0]
+	var lastDisc = discs[0]
 	var lastDistance = enode.LogDist(lastDisc.localnode.ID(), nodeID)
 
 	for _, disc := range discs[1:] {