chore: bump go version to 1.21.0 (#4250)

.github/workflows/go.yml

@@ -70,7 +70,7 @@ jobs:
       uses: golangci/golangci-lint-action@v3
       with:
         skip-cache: false
-        version: v1.51
+        version: v1.54.1
     - name: Whitespace check
       run: make check-whitespace
     - name: go mod tidy check

.golangci.yml

@@ -4,7 +4,7 @@ linters:
   enable:
     - asciicheck
     - bidichk
-    - depguard
+    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
     - dogsled
     - durationcheck
     - errcheck

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20 AS build
+FROM golang:1.21 AS build
 
 WORKDIR /src
 # enable modules caching in separate layer

pkg/encryption/encryption.go

@@ -185,10 +185,3 @@ func GenerateRandomKey(l int) Key {
 	}
 	return key
 }
-
-func min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}

pkg/skippeers/skippeers.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/ethersphere/bee/pkg/swarm"
-	"golang.org/x/exp/maps"
 )
 
 const MaxDuration time.Duration = math.MaxInt64
@@ -131,7 +130,7 @@ func (l *List) Close() error {
 	l.wg.Wait()
 
 	l.mtx.Lock()
-	maps.Clear(l.skip)
+	clear(l.skip)
 	l.mtx.Unlock()
 
 	return nil

pkg/storage/leveldbstore/recovery_test.go

@@ -8,13 +8,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"slices"
 	"testing"
 
 	"github.com/ethersphere/bee/pkg/storage"
 	"github.com/ethersphere/bee/pkg/storage/leveldbstore"
 	"github.com/ethersphere/bee/pkg/storage/storageutil"
 	"github.com/google/go-cmp/cmp"
-	"golang.org/x/exp/slices"
 )
 
 type obj struct {

pkg/storer/internal/chunkstore/recovery.go

@@ -7,13 +7,13 @@ package chunkstore
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	"github.com/ethersphere/bee/pkg/log"
 	"github.com/ethersphere/bee/pkg/sharky"
 	"github.com/ethersphere/bee/pkg/storage"
 	"github.com/ethersphere/bee/pkg/storage/storageutil"
 	"github.com/vmihailenco/msgpack/v5"
-	"golang.org/x/exp/slices"
 )
 
 var _ storage.Item = (*pendingTx)(nil)

pkg/storer/internal/chunkstore/recovery_test.go

@@ -8,8 +8,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/google/go-cmp/cmp/cmpopts"
-	"golang.org/x/exp/slices"
+	"slices"
 
 	"github.com/ethersphere/bee/pkg/sharky"
 	"github.com/ethersphere/bee/pkg/storage"
@@ -18,6 +17,7 @@ import (
 	"github.com/ethersphere/bee/pkg/storer/internal/chunkstore"
 	"github.com/ethersphere/bee/pkg/swarm"
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/spf13/afero"
 )
 

pkg/storer/reserve.go

@@ -9,6 +9,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 	"time"
 
@@ -18,7 +19,6 @@ import (
 	"github.com/ethersphere/bee/pkg/storer/internal"
 	"github.com/ethersphere/bee/pkg/storer/internal/reserve"
 	"github.com/ethersphere/bee/pkg/swarm"
-	"golang.org/x/exp/slices"
 )
 
 const (

pkg/storer/uploadstore.go

@@ -138,13 +138,6 @@ func (db *DB) DeleteSession(tagID uint64) error {
 func (db *DB) ListSessions(offset, limit int) ([]SessionInfo, error) {
 	const maxPageSize = 1000
 
-	min := func(a, b int) int {
-		if a < b {
-			return a
-		}
-		return b
-	}
-
 	limit = min(limit, maxPageSize)
 
 	tags, err := upload.ListAllTags(db.repo.IndexStore())

pkg/topology/mock/mock.go

@@ -6,13 +6,13 @@ package mock
 
 import (
 	"context"
+	"maps"
 	"sync"
 	"time"
 
 	"github.com/ethersphere/bee/pkg/p2p"
 	"github.com/ethersphere/bee/pkg/swarm"
 	"github.com/ethersphere/bee/pkg/topology"
-	"golang.org/x/exp/maps"
 )
 
 type mock struct {