.docker/Dockerfile.adm

@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM golang:1.21
+FROM golang:1.22
 
 WORKDIR /tmp
 

.docker/Dockerfile.cli

@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.ir

@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.docker/Dockerfile.storage

@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 ARG BUILD=now
 ARG VERSION=dev
 ARG REPO=repository

.forgejo/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.20', '1.21' ]
+        go_versions: [ '1.21', '1.22' ]
 
     steps:
       - uses: actions/checkout@v3

.forgejo/workflows/dco.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Run commit format checker
         uses: https://git.frostfs.info/TrueCloudLab/dco-go@v3

.forgejo/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: true
 
       - name: Install linters
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.20', '1.21' ]
+        go_versions: [ '1.21', '1.22' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -63,7 +63,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: true
 
       - name: Install staticcheck

.forgejo/workflows/vulncheck.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Install govulncheck
         run: go install golang.org/x/vuln/cmd/govulncheck@latest

Makefile

@@ -7,7 +7,7 @@ VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8
 HUB_IMAGE ?= truecloudlab/frostfs
 HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')"
 
-GO_VERSION ?= 1.21
+GO_VERSION ?= 1.22
 LINT_VERSION ?= 1.56.1
 TRUECLOUDLAB_LINT_VERSION ?= 0.0.5
 PROTOC_VERSION ?= 25.0

README.md

@@ -49,7 +49,7 @@ The latest version of frostfs-node works with frostfs-contract
 
 # Building
 
-To make all binaries you need Go 1.20+ and `make`:
+To make all binaries you need Go 1.21+ and `make`:
 ```
 make all
 ```

cmd/frostfs-adm/internal/modules/morph/container/container.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"slices"
 	"sort"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
@@ -446,7 +447,7 @@ func getCIDFilterFunc(cmd *cobra.Command) (func([]byte) bool, error) {
 		var id cid.ID
 		id.SetSHA256(v)
 		idStr := id.EncodeToString()
-		n := sort.Search(len(rawIDs), func(i int) bool { return rawIDs[i] >= idStr })
-		return n < len(rawIDs) && rawIDs[n] == idStr
+		_, found := slices.BinarySearch(rawIDs, idStr)
+		return found
 	}, nil
 }

cmd/frostfs-adm/internal/modules/morph/initialize/initialize_register.go

@@ -100,10 +100,7 @@ func registerCandidates(c *helper.InitializeContext) error {
 	// Register candidates in batches in order to overcome the signers amount limit.
 	// See: https://github.com/nspcc-dev/neo-go/blob/master/pkg/core/transaction/transaction.go#L27
 	for i := 0; i < need; i += registerBatchSize {
-		start, end := i, i+registerBatchSize
-		if end > need {
-			end = need
-		}
+		start, end := i, min(i+registerBatchSize, need)
 		// This check is sound because transactions are accepted/rejected atomically.
 		if have >= end {
 			continue

cmd/frostfs-cli/modules/control/shards_set_mode.go

@@ -3,7 +3,7 @@ package control
 import (
 	"bytes"
 	"fmt"
-	"sort"
+	"slices"
 	"strings"
 
 	rawclient "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
@@ -177,9 +177,6 @@ func getShardIDListFromIDFlag(cmd *cobra.Command, withAllFlag bool) [][]byte {
 		res = append(res, raw)
 	}
 
-	sort.Slice(res, func(i, j int) bool {
-		return bytes.Compare(res[i], res[j]) < 0
-	})
-
+	slices.SortFunc(res, bytes.Compare)
 	return res
 }

go.mod

@@ -1,6 +1,6 @@
 module git.frostfs.info/TrueCloudLab/frostfs-node
 
-go 1.20
+go 1.21
 
 require (
 	code.gitea.io/sdk/gitea v0.17.1

pkg/innerring/processors/frostfs/handlers.go

@@ -3,13 +3,13 @@ package frostfs
 import (
 	"bytes"
 	"encoding/hex"
+	"slices"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring/processors"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event"
 	frostfsEvent "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 )
 
 func (np *Processor) handleDeposit(ev event.Event) {

pkg/innerring/processors/netmap/cleanup_table.go

@@ -82,10 +82,7 @@ func (c *cleanupTable) touch(keyString string, now uint64, binNodeInfo []byte) b
 	result := !ok || access.removeFlag || !bytes.Equal(access.binNodeInfo, binNodeInfo)
 
 	access.removeFlag = false // reset remove flag on each touch
-	if now > access.epoch {
-		access.epoch = now
-	}
-
+	access.epoch = max(access.epoch, now)
 	access.binNodeInfo = binNodeInfo // update binary node info
 
 	c.lastAccess[keyString] = access

pkg/local_object_storage/blobovnicza/iterate.go

@@ -56,14 +56,6 @@ func (b *Blobovnicza) iterateBounds(useObjLimitBound bool, f func(uint64, uint64
 	return nil
 }
 
-func max(a, b uint64) uint64 {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
 // IterationElement represents a unit of elements through which Iterate operation passes.
 type IterationElement struct {
 	addr oid.Address

pkg/local_object_storage/engine/list.go

@@ -134,10 +134,7 @@ func (e *StorageEngine) ListWithCursor(ctx context.Context, prm ListWithCursorPr
 			continue
 		}
 
-		count := prm.count - uint32(len(result))
-		if count > batchSize {
-			count = batchSize
-		}
+		count := min(prm.count-uint32(len(result)), batchSize)
 
 		var shardPrm shard.ListWithCursorPrm
 		shardPrm.WithCount(count)

pkg/local_object_storage/engine/list_test.go

@@ -3,7 +3,6 @@ package engine
 import (
 	"context"
 	"path/filepath"
-	"sort"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
@@ -18,13 +17,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func sortAddresses(addrWithType []object.AddressWithType) []object.AddressWithType {
-	sort.Slice(addrWithType, func(i, j int) bool {
-		return addrWithType[i].Address.EncodeToString() < addrWithType[j].Address.EncodeToString()
-	})
-	return addrWithType
-}
-
 func TestListWithCursor(t *testing.T) {
 	t.Parallel()
 
@@ -98,7 +90,6 @@ func TestListWithCursor(t *testing.T) {
 				require.NoError(t, err)
 				expected = append(expected, object.AddressWithType{Type: objectSDK.TypeRegular, Address: object.AddressOf(obj)})
 			}
-			expected = sortAddresses(expected)
 
 			var prm ListWithCursorPrm
 			prm.count = tt.batchSize
@@ -113,8 +104,7 @@ func TestListWithCursor(t *testing.T) {
 				prm.cursor = res.Cursor()
 			}
 
-			got = sortAddresses(got)
-			require.Equal(t, expected, got)
+			require.ElementsMatch(t, expected, got)
 		})
 	}
 }

pkg/local_object_storage/internal/testutil/generators_test.go

@@ -2,10 +2,10 @@ package testutil
 
 import (
 	"encoding/binary"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )
 
 func TestOverwriteObjGenerator(t *testing.T) {

pkg/local_object_storage/metabase/containers_test.go

@@ -3,7 +3,6 @@ package meta_test
 import (
 	"context"
 	"math/rand"
-	"sort"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
@@ -108,18 +107,9 @@ func TestDB_ContainersCount(t *testing.T) {
 		}
 	}
 
-	sort.Slice(expected, func(i, j int) bool {
-		return expected[i].EncodeToString() < expected[j].EncodeToString()
-	})
-
 	got, err := db.Containers(context.Background())
 	require.NoError(t, err)
-
-	sort.Slice(got, func(i, j int) bool {
-		return got[i].EncodeToString() < got[j].EncodeToString()
-	})
-
-	require.Equal(t, expected, got)
+	require.ElementsMatch(t, expected, got)
 }
 
 func TestDB_ContainerSize(t *testing.T) {

pkg/local_object_storage/metabase/list_test.go

@@ -3,7 +3,6 @@ package meta_test
 import (
 	"context"
 	"errors"
-	"sort"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
@@ -128,8 +127,6 @@ func TestLisObjectsWithCursor(t *testing.T) {
 		expected = append(expected, object.AddressWithType{Address: object.AddressOf(child), Type: objectSDK.TypeRegular})
 	}
 
-	expected = sortAddresses(expected)
-
 	t.Run("success with various count", func(t *testing.T) {
 		for countPerReq := 1; countPerReq <= total; countPerReq++ {
 			got := make([]object.AddressWithType, 0, total)
@@ -151,9 +148,7 @@ func TestLisObjectsWithCursor(t *testing.T) {
 
 			_, _, err = metaListWithCursor(db, uint32(countPerReq), cursor)
 			require.ErrorIs(t, err, meta.ErrEndOfListing, "count:%d", countPerReq, cursor)
-
-			got = sortAddresses(got)
-			require.Equal(t, expected, got, "count:%d", countPerReq)
+			require.ElementsMatch(t, expected, got, "count:%d", countPerReq)
 		}
 	})
 
@@ -216,13 +211,6 @@ func TestAddObjectDuringListingWithCursor(t *testing.T) {
 	}
 }
 
-func sortAddresses(addrWithType []object.AddressWithType) []object.AddressWithType {
-	sort.Slice(addrWithType, func(i, j int) bool {
-		return addrWithType[i].Address.EncodeToString() < addrWithType[j].Address.EncodeToString()
-	})
-	return addrWithType
-}
-
 func metaListWithCursor(db *meta.DB, count uint32, cursor *meta.Cursor) ([]object.AddressWithType, *meta.Cursor, error) {
 	var listPrm meta.ListPrm
 	listPrm.SetCount(count)

pkg/local_object_storage/pilorama/batch.go

@@ -2,6 +2,7 @@ package pilorama
 
 import (
 	"encoding/binary"
+	"slices"
 	"sort"
 	"sync"
 	"time"
@@ -50,7 +51,7 @@ func (b *batch) run() {
 		sort.Slice(b.operations, func(i, j int) bool {
 			return b.operations[i].Time < b.operations[j].Time
 		})
-		b.operations = removeDuplicatesInPlace(b.operations)
+		b.operations = slices.CompactFunc(b.operations, func(x, y *Move) bool { return x.Time == y.Time })
 
 		// Our main use-case is addition of new items. In this case,
 		// we do not need to perform undo()/redo(), just do().
@@ -115,15 +116,3 @@ func (b *batch) run() {
 		b.results[i] <- err
 	}
 }
-
-func removeDuplicatesInPlace(a []*Move) []*Move {
-	equalCount := 0
-	for i := 1; i < len(a); i++ {
-		if a[i].Time == a[i-1].Time {
-			equalCount++
-		} else {
-			a[i-equalCount] = a[i]
-		}
-	}
-	return a[:len(a)-equalCount]
-}

pkg/local_object_storage/pilorama/batch_test.go

@@ -1,70 +0,0 @@
-package pilorama
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_removeDuplicatesInPlace(t *testing.T) {
-	testCases := []struct {
-		before []int
-		after  []int
-	}{
-		{
-			before: []int{},
-			after:  []int{},
-		},
-		{
-			before: []int{1},
-			after:  []int{1},
-		},
-		{
-			before: []int{1, 2},
-			after:  []int{1, 2},
-		},
-		{
-			before: []int{1, 2, 3},
-			after:  []int{1, 2, 3},
-		},
-		{
-			before: []int{1, 1, 2},
-			after:  []int{1, 2},
-		},
-		{
-			before: []int{1, 2, 2},
-			after:  []int{1, 2},
-		},
-		{
-			before: []int{1, 2, 2, 3},
-			after:  []int{1, 2, 3},
-		},
-		{
-			before: []int{1, 1, 1},
-			after:  []int{1},
-		},
-		{
-			before: []int{1, 1, 2, 2},
-			after:  []int{1, 2},
-		},
-		{
-			before: []int{1, 1, 1, 2, 3, 3, 3},
-			after:  []int{1, 2, 3},
-		},
-	}
-
-	for _, tc := range testCases {
-		ops := make([]*Move, len(tc.before))
-		for i := range ops {
-			ops[i] = &Move{Meta: Meta{Time: Timestamp(tc.before[i])}}
-		}
-
-		expected := make([]*Move, len(tc.after))
-		for i := range expected {
-			expected[i] = &Move{Meta: Meta{Time: Timestamp(tc.after[i])}}
-		}
-
-		actual := removeDuplicatesInPlace(ops)
-		require.Equal(t, expected, actual, "%d", tc.before)
-	}
-}

pkg/local_object_storage/shard/gc.go

@@ -343,16 +343,8 @@ func (s *Shard) removeGarbage(pctx context.Context) (result gcRunResult) {
 }
 
 func (s *Shard) getExpiredObjectsParameters() (workerCount, batchSize int) {
-	workerCount = minExpiredWorkers
-	batchSize = minExpiredBatchSize
-
-	if s.gc.gcCfg.expiredCollectorBatchSize > batchSize {
-		batchSize = s.gc.gcCfg.expiredCollectorBatchSize
-	}
-
-	if s.gc.gcCfg.expiredCollectorWorkerCount > workerCount {
-		workerCount = s.gc.gcCfg.expiredCollectorWorkerCount
-	}
+	workerCount = max(minExpiredWorkers, s.gc.gcCfg.expiredCollectorWorkerCount)
+	batchSize = max(minExpiredBatchSize, s.gc.gcCfg.expiredCollectorBatchSize)
 	return
 }
 

pkg/morph/client/notary.go

@@ -162,11 +162,7 @@ func (c *Client) DepositNotary(amount fixedn.Fixed8, delta uint32) (res util.Uin
 		return util.Uint256{}, fmt.Errorf("can't get previous expiration value: %w", err)
 	}
 
-	till := int64(bc + delta)
-	if till < currentTill {
-		till = currentTill
-	}
-
+	till := max(int64(bc+delta), currentTill)
 	return c.depositNotary(amount, till)
 }
 

pkg/services/object/internal/client/client.go

@@ -343,10 +343,7 @@ func PayloadRange(ctx context.Context, prm PayloadRangePrm) (*PayloadRangeRes, e
 		return nil, new(apistatus.ObjectOutOfRange)
 	}
 
-	ln := prm.ln
-	if ln > maxInitialBufferSize {
-		ln = maxInitialBufferSize
-	}
+	ln := min(prm.ln, maxInitialBufferSize)
 
 	w := bytes.NewBuffer(make([]byte, 0, ln))
 	_, err = io.CopyN(w, rdr, int64(prm.ln))

pkg/services/object/transport_splitter.go

@@ -164,10 +164,7 @@ func (s *searchStreamMsgSizeCtrl) Send(resp *object.SearchResponse) error {
 			newResp.SetBody(body)
 		}
 
-		cut := s.addrAmount
-		if cut > ln {
-			cut = ln
-		}
+		cut := min(s.addrAmount, ln)
 
 		body.SetIDList(ids[:cut])
 		newResp.SetMetaHeader(resp.GetMetaHeader())

pkg/services/policer/policer_test.go

@@ -388,10 +388,7 @@ func (it *sliceKeySpaceIterator) Next(_ context.Context, size uint32) ([]objectc
 	if it.cur >= len(it.objs) {
 		return nil, engine.ErrEndOfListing
 	}
-	end := it.cur + int(size)
-	if end > len(it.objs) {
-		end = len(it.objs)
-	}
+	end := min(it.cur+int(size), len(it.objs))
 	ret := it.objs[it.cur:end]
 	it.cur = end
 	return ret, nil

pkg/services/tree/getsubtree_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"path"
 	"path/filepath"
-	"sort"
+	"slices"
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama"
@@ -192,9 +192,7 @@ func testGetSubTreeOrderAsc(t *testing.T, p pilorama.ForestStorage) {
 			require.True(t, found, "unknown node %d %v", i, acc.seen[i].GetBody().GetNodeId())
 		}
 
-		require.True(t, sort.SliceIsSorted(paths, func(i, j int) bool {
-			return paths[i] < paths[j]
-		}))
+		require.True(t, slices.IsSorted(paths))
 	})
 	t.Run("depth=1", func(t *testing.T) {
 		acc := subTreeAcc{errIndex: -1}

pkg/services/tree/sync.go

@@ -167,9 +167,7 @@ func mergeOperationStreams(streams []chan *pilorama.Move, merged chan<- *piloram
 		merged <- ms[minTimeMoveIndex]
 		height := ms[minTimeMoveIndex].Time
 		if ms[minTimeMoveIndex] = <-streams[minTimeMoveIndex]; ms[minTimeMoveIndex] == nil {
-			if minStreamedLastHeight > height {
-				minStreamedLastHeight = height
-			}
+			minStreamedLastHeight = min(minStreamedLastHeight, height)
 		}
 	}
 
@@ -203,9 +201,7 @@ func (s *Service) applyOperationStream(ctx context.Context, cid cid.ID, treeID s
 		errGroup.Go(func() error {
 			if err := s.forest.TreeApply(ctx, cid, treeID, m, true); err != nil {
 				heightMtx.Lock()
-				if m.Time < unappliedOperationHeight {
-					unappliedOperationHeight = m.Time
-				}
+				unappliedOperationHeight = min(unappliedOperationHeight, m.Time)
 				heightMtx.Unlock()
 				return err
 			}