Merge pull request #757 from gobitfly/BEDS-310/migrate_go_1_23

feat: update go to 1.23, update linter dependencies
gobitfly · Aug 21, 2024 · 65f01b2 · 65f01b2
2 parents 8657478 + 8082874
commit 65f01b2
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 50 deletions.
diff --git a/.github/workflows/backend-linter.yml b/.github/workflows/backend-linter.yml
@@ -30,12 +30,12 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.23'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.56.1
+          version: v1.60.1
           working-directory: backend
           args: --timeout=5m
 

diff --git a/backend/.golangci.yml b/backend/.golangci.yml
@@ -20,19 +20,12 @@ linters:
     - importas
     - unparam
   disable:
-    - exhaustivestruct
-    - golint
-    - ifshort
-    - interfacer
-    - maligned
-    - nosnakecase
-    - scopelint
-    - structcheck
-    - varcheck
     - dupword
     - gocognit
     - dupl
-    # - mnd
+    - mnd
+    - copyloopvar
+    - intrange
 
     # Disabled for now:
     - asasalint
@@ -53,7 +46,7 @@ linters:
     - gocyclo
     - godot
     - godox
-    - goerr113
+    - err113
     - gofumpt
     - gomnd
     - gomoddirectives

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,5 +1,5 @@
 # this is meant to be built with the root of this repo as build-context
-FROM golang:1.22.0 AS build-env
+FROM golang:1.23.0 AS build-env
 COPY backend/go.mod backend/go.sum /src/backend/
 WORKDIR /src/backend
 RUN go mod download

diff --git a/backend/cmd/api/main.go b/backend/cmd/api/main.go
@@ -28,8 +28,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/blobindexer/main.go b/backend/cmd/blobindexer/main.go
@@ -17,7 +17,7 @@ func main() {
 	versionFlag := flag.Bool("version", false, "print version and exit")
 	flag.Parse()
 	if *versionFlag {
-		log.Infof(version.Version)
+		log.Info(version.Version)
 		return
 	}
 	utils.Config = &types.Config{}

diff --git a/backend/cmd/eth1indexer/main.go b/backend/cmd/eth1indexer/main.go
@@ -77,8 +77,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 
@@ -731,7 +731,7 @@ func ImportMainnetERC20TokenMetadataFromTokenDirectory(bt *db.Bigtable) {
 		if len(token.LogoURI) > 0 {
 			resp, err := client.Get(token.LogoURI)
 
-			if err == nil && resp.StatusCode == 200 {
+			if err == nil && resp.StatusCode == http.StatusOK {
 				body, err := io.ReadAll(resp.Body)
 
 				if err != nil {

diff --git a/backend/cmd/ethstore_exporter/main.go b/backend/cmd/ethstore_exporter/main.go
@@ -34,8 +34,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/exporter/main.go b/backend/cmd/exporter/main.go
@@ -26,8 +26,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/misc/main.go b/backend/cmd/misc/main.go
@@ -97,7 +97,7 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
+		log.Info(version.Version)
 		return
 	}
 
@@ -763,7 +763,7 @@ func migrateAppPurchases(appStoreSecret string) error {
 			return errors.Wrap(err, "error verifying receipt")
 		}
 
-		if resp.LatestReceiptInfo == nil || len(resp.LatestReceiptInfo) == 0 {
+		if len(resp.LatestReceiptInfo) == 0 {
 			log.Infof("no receipt info for purchase id %v", receipt.ID)
 			if receipt.Active && receipt.ValidateRemotely { // sanity, if there is an active subscription without receipt info we cam't delete it.
 				return fmt.Errorf("no receipt info for active purchase id %v", receipt.ID)

diff --git a/backend/cmd/node_jobs_processor/main.go b/backend/cmd/node_jobs_processor/main.go
@@ -23,8 +23,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/notification_collector/main.go b/backend/cmd/notification_collector/main.go
@@ -32,8 +32,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/notification_sender/main.go b/backend/cmd/notification_sender/main.go
@@ -31,8 +31,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/rewards_exporter/main.go b/backend/cmd/rewards_exporter/main.go
@@ -39,8 +39,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/signatures/main.go b/backend/cmd/signatures/main.go
@@ -35,8 +35,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/cmd/statistics/main.go b/backend/cmd/statistics/main.go
@@ -50,8 +50,8 @@ func main() {
 	flag.Parse()
 
 	if *versionFlag {
-		log.Infof(version.Version)
-		log.Infof(version.GoVersion)
+		log.Info(version.Version)
+		log.Info(version.GoVersion)
 		return
 	}
 

diff --git a/backend/go.mod b/backend/go.mod
@@ -1,6 +1,6 @@
 module github.com/gobitfly/beaconchain
 
-go 1.22
+go 1.23
 
 require (
 	cloud.google.com/go/bigtable v1.21.0

diff --git a/backend/pkg/api/data_access/dummy.go b/backend/pkg/api/data_access/dummy.go
@@ -38,14 +38,14 @@ func NewDummyService() *DummyService {
 		rand.Shuffle(len(possibleChainIds), func(i, j int) {
 			possibleChainIds[i], possibleChainIds[j] = possibleChainIds[j], possibleChainIds[i]
 		})
-		return possibleChainIds[:rand.IntN(len(possibleChainIds))], nil
+		return possibleChainIds[:rand.IntN(len(possibleChainIds))], nil //nolint:gosec
 	})
 	return &DummyService{}
 }
 
 // generate random decimal.Decimal, should result in somewhere around 0.001 ETH (+/- a few decimal places) in Wei
 func randomEthDecimal() decimal.Decimal {
-	decimal, _ := decimal.NewFromString(fmt.Sprintf("%d00000000000", rand.Int64N(10000000)))
+	decimal, _ := decimal.NewFromString(fmt.Sprintf("%d00000000000", rand.Int64N(10000000))) //nolint:gosec
 	return decimal
 }
 

diff --git a/backend/pkg/blobindexer/blobs.go b/backend/pkg/blobindexer/blobs.go
@@ -238,7 +238,7 @@ func (bi *BlobIndexer) IndexBlobsAtSlot(slot uint64) error {
 			if err != nil {
 				// Only put the object if it does not exist yet
 				var httpResponseErr *awshttp.ResponseError
-				if errors.As(err, &httpResponseErr) && (httpResponseErr.HTTPStatusCode() == 404 || httpResponseErr.HTTPStatusCode() == 403) {
+				if errors.As(err, &httpResponseErr) && (httpResponseErr.HTTPStatusCode() == http.StatusNotFound || httpResponseErr.HTTPStatusCode() == 403) {
 					tS3PutObj := time.Now()
 					_, putErr := bi.S3Client.PutObject(gCtx, &s3.PutObjectInput{
 						Bucket: &utils.Config.BlobIndexer.S3.Bucket,

diff --git a/backend/pkg/commons/log/log.go b/backend/pkg/commons/log/log.go
@@ -40,7 +40,7 @@ func InfoWithFields(additionalInfos Fields, msg string) {
 		logFields = logFields.WithField(name, info)
 	}
 
-	logFields.Infof(msg)
+	logFields.Info(msg)
 }
 
 func Warn(args ...interface{}) {
@@ -57,7 +57,7 @@ func WarnWithFields(additionalInfos Fields, msg string) {
 		logFields = logFields.WithField(name, info)
 	}
 
-	logFields.Warnf(msg)
+	logFields.Warn(msg)
 }
 
 func Tracef(format string, args ...interface{}) {
@@ -70,7 +70,7 @@ func TraceWithFields(additionalInfos Fields, msg string) {
 		logFields = logFields.WithField(name, info)
 	}
 
-	logFields.Tracef(msg)
+	logFields.Trace(msg)
 }
 
 func DebugWithFields(additionalInfos Fields, msg string) {
@@ -79,7 +79,7 @@ func DebugWithFields(additionalInfos Fields, msg string) {
 		logFields = logFields.WithField(name, info)
 	}
 
-	logFields.Debugf(msg)
+	logFields.Debug(msg)
 }
 
 func Debugf(format string, args ...interface{}) {

diff --git a/backend/pkg/exporter/modules/dashboard_data.go b/backend/pkg/exporter/modules/dashboard_data.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"math"
+	"net/http"
 	"regexp"
 	"sort"
 	"strconv"
@@ -1214,7 +1215,7 @@ func (d *dashboardData) getData(epoch, slotsPerEpoch uint64, skipSerialCalls boo
 					_, err := cl.GetBlockHeader(slot)
 					if err != nil {
 						httpErr := network.SpecificError(err)
-						if httpErr != nil && httpErr.StatusCode == 404 {
+						if httpErr != nil && httpErr.StatusCode == http.StatusNotFound {
 							result.missedslots[slot] = true
 							continue // missed
 						}
@@ -1236,7 +1237,7 @@ func (d *dashboardData) getData(epoch, slotsPerEpoch uint64, skipSerialCalls boo
 			block, err := cl.GetSlot(slot)
 			if err != nil {
 				httpErr := network.SpecificError(err)
-				if httpErr != nil && httpErr.StatusCode == 404 {
+				if httpErr != nil && httpErr.StatusCode == http.StatusNotFound {
 					mutex.Lock()
 					result.missedslots[slot] = true
 					mutex.Unlock()
@@ -1835,7 +1836,7 @@ func refreshMaterializedSlashedByCounts() error {
 // 					blockReward, err := d.CL.GetPropoalRewards(slot)
 // 					if err != nil {
 // 						httpErr := network.SpecificError(err)
-// 						if httpErr != nil && httpErr.StatusCode == 404 {
+// 						if httpErr != nil && httpErr.StatusCode == http.StatusNotFound {
 // 							return nil
 // 						}
 

diff --git a/backend/pkg/exporter/modules/rocketpool.go b/backend/pkg/exporter/modules/rocketpool.go
@@ -14,6 +14,7 @@ import (
 	"github.com/gobitfly/beaconchain/pkg/commons/db"
 	"github.com/gobitfly/beaconchain/pkg/commons/log"
 	"github.com/gobitfly/beaconchain/pkg/commons/utils"
+	"github.com/pkg/errors"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -1847,7 +1848,7 @@ func DownloadRewardsFile(fileName string, interval uint64, cid string, isDaemon
 		}
 	}
 
-	return nil, fmt.Errorf(errBuilder.String())
+	return nil, errors.New(errBuilder.String())
 }
 
 // Decompresses a rewards file