Upd/go 1.22

.docker/Dockerfile.adm

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

.docker/Dockerfile.cli

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

.docker/Dockerfile.ir

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

.docker/Dockerfile.storage

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

.docker/Dockerfile.storage-testnet

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

.github/workflows/go.yml

@@ -46,11 +46,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04, macos-14]
-        go: [ '1.21', '1.22', '1.23' ]
+        go: [ '1.22', '1.23' ]
         exclude:
           # Only the latest Go version MacOS.
-          - os: macos-14
-            go: '1.21'
           - os: macos-14
             go: '1.22'
           # Exclude the latest Go version for Ubuntu as Coverage uses it.

.golangci.yml

@@ -58,6 +58,7 @@ linters:
     - gofmt
     - goimports
     - gomodguard
+    - intrange
     - misspell
     - predeclared
     - reassign

CHANGELOG.md

@@ -14,7 +14,7 @@ Changelog for NeoFS Node
 ### Removed
 
 ### Updated
-- Go to 1.21 version (#2517)
+- Go to 1.22 version (#2517, #2738)
 
 ### Updating from v0.43.0
 

README.md

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

cmd/neofs-adm/internal/modules/config/config.go

@@ -126,7 +126,7 @@ func generateConfigExample(appDir string, credSize int) (string, error) {
 	}
 	tmpl.AlphabetDir = filepath.Join(appDir, "alphabet-wallets")
 
-	for i := 0; i < credSize; i++ {
+	for i := range credSize {
 		tmpl.Glagolitics = append(tmpl.Glagolitics, glagolitsa.LetterByIndex(i))
 	}
 

cmd/neofs-adm/internal/modules/morph/dump_hashes.go

@@ -64,7 +64,7 @@
 	}
 
 	var contracts = make([]string, 0, irSize+len(contractList))
-	for i := 0; i < irSize; i++ {
+	for i := range irSize {
 		contracts = append(contracts, getAlphabetNNSDomain(i))
 	}
 	contracts = append(contracts, contractList...)

cmd/neofs-adm/internal/modules/morph/generate.go

@@ -211,7 +211,7 @@ func createWallets(fileNameTemplate, label, password string, number uint32) ([]u
 	base := strings.TrimSuffix(fileNameTemplate, ext)
 	walletNumberFormat := fmt.Sprintf("%%0%dd", digitsNum(number))
 
-	for i := 0; i < int(number); i++ {
+	for i := range int(number) {
 		filename := fileNameTemplate
 		if number != 1 {
 			filename = base + "_" + fmt.Sprintf(walletNumberFormat, i) + ext

cmd/neofs-adm/internal/modules/morph/initialize.go

@@ -198,7 +198,7 @@
 
 	var size int
 loop:
-	for i := 0; i < len(walletFiles); i++ {
+	for i := range walletFiles {
 		name := glagolitsa.LetterByIndex(i) + ".json"
 		for j := range walletFiles {
 			if walletFiles[j].Name() == name {
@@ -213,7 +213,7 @@
 	}
 
 	wallets := make([]*wallet.Wallet, size)
-	for i := 0; i < size; i++ {
+	for i := range size {
 		letter := glagolitsa.LetterByIndex(i)
 		p := filepath.Join(walletDir, letter+".json")
 		w, err := wallet.NewWalletFromFile(p)

cmd/neofs-adm/internal/modules/morph/initialize_test.go

@@ -82,7 +82,7 @@ func generateTestData(t *testing.T, dir string, size int) {
 	require.NoError(t, generateAlphabetCreds(generateAlphabetCmd, nil))
 
 	var pubs []string
-	for i := 0; i < size; i++ {
+	for i := range size {
 		p := filepath.Join(dir, glagolitsa.LetterByIndex(i)+".json")
 		w, err := wallet.NewWalletFromFile(p)
 		require.NoError(t, err, "wallet doesn't exist")
@@ -110,7 +110,7 @@ func generateTestData(t *testing.T, dir string, size int) {
 }
 
 func setTestCredentials(v *viper.Viper, size int) {
-	for i := 0; i < size; i++ {
+	for i := range size {
 		v.Set("credentials."+glagolitsa.LetterByIndex(i), strconv.FormatUint(uint64(i), 10))
 	}
 }

cmd/neofs-cli/modules/util/acl.go

@@ -35,7 +35,7 @@
 	fmt.Fprintln(w, strings.Join(bits, "\t"))
 	// Footer
 	footer := []string{"X F"}
-	for i := 0; i < 7; i++ {
+	for range 7 {
 		footer = append(footer, "U S O B")
 	}
 	fmt.Fprintln(w, strings.Join(footer, "\t"))

cmd/neofs-node/config/node/config.go

@@ -117,7 +117,7 @@ func BootstrapAddresses(c *config.Config) (addr network.AddressGroup) {
 func Attributes(c *config.Config) (attrs []string) {
 	const maxAttributes = 100
 
-	for i := 0; i < maxAttributes; i++ {
+	for i := range maxAttributes {
 		attr := config.StringSafe(c.Sub(subsection), attributePrefix+"_"+strconv.Itoa(i))
 		if attr == "" {
 			return

cmd/neofs-node/reputation/ticker/fixed_test.go

@@ -50,7 +50,7 @@ func TestFixedTimer_Tick(t *testing.T) {
 
 			require.NoError(t, err)
 
-			for i := 0; i < int(test.duration); i++ {
+			for range test.duration {
 				if !timer.Tick() {
 					break
 				}

go.mod

@@ -1,6 +1,6 @@
 module github.com/nspcc-dev/neofs-node
 
-go 1.21
+go 1.22
 
 require (
 	github.com/cheggaaa/pb v1.0.29

pkg/core/object/fmt.go

@@ -327,7 +327,7 @@ func (v *FormatValidator) ValidateContent(o *object.Object) (ContentMeta, error)
 
 		uniqueFilter := make(map[oid.ID]struct{}, lenMM)
 
-		for i := 0; i < lenMM; i++ {
+		for i := range lenMM {
 			if _, alreadySeen := uniqueFilter[mm[i]]; alreadySeen {
 				return ContentMeta{}, fmt.Errorf("storage group contains non-unique member: %s", mm[i])
 			}

pkg/innerring/contracts.go

@@ -121,7 +121,7 @@
 		num = glagolitsa.Size
 	}
 
-	for ind := 0; ind < num; ind++ {
+	for ind := range num {
 		letter := glagolitsa.LetterByIndex(ind)
 		contractHash, err := parseContract(ctx, _logger, cfg, morph,
 			"contracts.alphabet."+letter,

pkg/innerring/processors/audit/scheduler_test.go

@@ -21,7 +21,7 @@ func TestSelect(t *testing.T) {
 
 		m := hitMap(cids)
 
-		for i := 0; i < irSize; i++ {
+		for i := range irSize {
 			s := audit.Select(cids, 0, uint64(i), irSize)
 			require.Equal(t, len(cids)/irSize, len(s))
 
@@ -41,7 +41,7 @@ func TestSelect(t *testing.T) {
 
 		m := hitMap(cids)
 
-		for i := 0; i < irSize; i++ {
+		for i := range irSize {
 			s := audit.Select(cids, 0, uint64(i), irSize)
 
 			for _, id := range s {
@@ -60,7 +60,7 @@ func TestSelect(t *testing.T) {
 
 		m := hitMap(cids)
 
-		for i := 0; i < irSize; i++ {
+		for i := range irSize {
 			s := audit.Select(cids, uint64(i), 0, irSize)
 
 			for _, id := range s {
@@ -78,7 +78,7 @@ func TestSelect(t *testing.T) {
 func generateContainers(n int) []cid.ID {
 	result := make([]cid.ID, n)
 
-	for i := 0; i < n; i++ {
+	for i := range n {
 		result[i] = cidtest.ID()
 	}
 

pkg/innerring/processors/governance/list_test.go

@@ -50,7 +50,7 @@ func TestNewAlphabetList(t *testing.T) {
 		}
 		ln := len(rounds)
 
-		for i := 0; i < ln; i++ {
+		for i := range ln {
 			list, err = newAlphabetList(list, exp)
 			require.NoError(t, err)
 			require.True(t, equalPublicKeyLists(list, rounds[i]))
@@ -132,7 +132,7 @@ func TestUpdateInnerRing(t *testing.T) {
 func generateKeys(n int) (keys.PublicKeys, error) {
 	pubKeys := make(keys.PublicKeys, 0, n)
 
-	for i := 0; i < n; i++ {
+	for range n {
 		privKey, err := keys.NewPrivateKey()
 		if err != nil {
 			return nil, err

pkg/local_object_storage/blobstor/bench_test.go

@@ -45,10 +45,10 @@ func benchmark(b *testing.B, p common.Storage, objSize uint64, nThreads int) {
 
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		var wg sync.WaitGroup
 
-		for i := 0; i < nThreads; i++ {
+		for range nThreads {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -140,7 +140,7 @@ func BenchmarkGet(b *testing.B) {
 					}
 
 					var ach = make(chan oid.Address)
-					for i := 0; i < 100; i++ {
+					for range 100 {
 						go func() {
 							for j := 0; j < nObjects/100; j++ {
 								prm := prm
@@ -153,16 +153,16 @@ func BenchmarkGet(b *testing.B) {
 							}
 						}()
 					}
-					for i := 0; i < nObjects; i++ {
+					for range nObjects {
 						a := <-ach
 						objs = append(objs, a)
 					}
 
 					b.ResetTimer()
-					for n := 0; n < b.N; n++ {
+					for n := range b.N {
 						var wg sync.WaitGroup
 
-						for i := 0; i < tc.nThreads; i++ {
+						for i := range tc.nThreads {
 							wg.Add(1)
 							go func(ind int) {
 								defer wg.Done()

pkg/local_object_storage/blobstor/blobstor_test.go

@@ -49,7 +49,7 @@ func TestCompression(t *testing.T) {
 
 	bigObj := make([]*objectSDK.Object, objCount)
 	smallObj := make([]*objectSDK.Object, objCount)
-	for i := 0; i < objCount; i++ {
+	for i := range objCount {
 		bigObj[i] = testObject(smallSizeLimit * 2)
 		smallObj[i] = testObject(smallSizeLimit / 2)
 	}

pkg/local_object_storage/blobstor/common/storage_test.go

@@ -25,7 +25,7 @@ func TestCopy(t *testing.T) {
 
 	mObjs := make(map[oid.Address][]byte, nObjects)
 
-	for i := 0; i < nObjects; i++ {
+	for range nObjects {
 		addr := oidtest.Address()
 		data := make([]byte, 32)
 		rand.Read(data)

pkg/local_object_storage/blobstor/compression/bench_test.go

@@ -34,7 +34,7 @@ func BenchmarkCompression(b *testing.B) {
 func benchWith(b *testing.B, c Config, data []byte) {
 	b.ResetTimer()
 	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		_ = c.Compress(data)
 	}
 }

pkg/local_object_storage/blobstor/fstree/fstree_write_generic.go

@@ -57,7 +57,7 @@
 	// In a very rare situation we can have multiple partially written copies on disk,
 	// this will be fixed in another issue (we should remove garbage on start).
 	const retryCount = 5
-	for i := 0; i < retryCount; i++ {
+	for i := range retryCount {
 		tmpPath := p + "#" + strconv.FormatUint(uint64(i), 10)
 		err := w.writeAndRename(tmpPath, p, data)
 		if err != syscall.EEXIST || i == retryCount-1 {

pkg/local_object_storage/blobstor/iterate_test.go

@@ -144,7 +144,7 @@ func TestIterate_IgnoreErrors(t *testing.T) {
 	//require.NoError(t, b.Init())
 	//
 	//var p string
-	//for i := 0; i < 2; i++ {
+	//for i := range 2 {
 	//	bp := filepath.Join(bs.rootPath, "1", strconv.FormatUint(uint64(i), 10))
 	//	if _, ok := bs.blobovniczas.opened.Get(bp); !ok {
 	//		p = bp

pkg/local_object_storage/engine/container_test.go

@@ -33,7 +33,7 @@ func TestStorageEngine_ContainerCleanUp(t *testing.T) {
 		_ = e.Close()
 	})
 
-	for i := 0; i < 5; i++ {
+	for i := range 5 {
 		_, err := e.AddShard(
 			shard.WithBlobStorOptions(
 				blobstor.WithStorages(newStorages(filepath.Join(path, strconv.Itoa(i)), errSmallSize))),

pkg/local_object_storage/engine/control_test.go

@@ -271,7 +271,7 @@ func engineWithShards(t *testing.T, path string, num int) (*StorageEngine, []str
 	currShards := make([]string, 0, num)
 
 	e := New()
-	for i := 0; i < num; i++ {
+	for i := range num {
 		id, err := e.AddShard(
 			shard.WithBlobStorOptions(
 				blobstor.WithStorages(newStorages(filepath.Join(addPath, strconv.Itoa(i)), errSmallSize))),

pkg/local_object_storage/engine/engine_test.go

@@ -51,7 +51,7 @@ func BenchmarkExists(b *testing.B) {
 
 func benchmarkExists(b *testing.B, shardNum int) {
 	shards := make([]*shard.Shard, shardNum)
-	for i := 0; i < shardNum; i++ {
+	for i := range shardNum {
 		shards[i] = testNewShard(b, i)
 	}
 
@@ -62,7 +62,7 @@ func benchmarkExists(b *testing.B, shardNum int) {
 	})
 
 	addr := oidtest.Address()
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		obj := generateObjectWithCID(b, cidtest.ID())
 		err := Put(e, obj)
 		if err != nil {
@@ -72,7 +72,7 @@ func benchmarkExists(b *testing.B, shardNum int) {
 
 	b.ReportAllocs()
 	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ok, err := e.exists(addr)
 		if err != nil || ok {
 			b.Fatalf("%t %v", ok, err)
@@ -149,7 +149,7 @@ func testNewShard(t testing.TB, id int) *shard.Shard {
 
 func testEngineFromShardOpts(t *testing.T, num int, extraOpts []shard.Option) *StorageEngine {
 	engine := New()
-	for i := 0; i < num; i++ {
+	for i := range num {
 		_, err := engine.AddShard(append([]shard.Option{
 			shard.WithBlobStorOptions(
 				blobstor.WithStorages(
@@ -210,7 +210,7 @@ func addAttribute(obj *object.Object, key, val string) {
 func testNewEngineWithShardNum(t *testing.T, num int) *StorageEngine {
 	shards := make([]*shard.Shard, 0, num)
 
-	for i := 0; i < num; i++ {
+	for i := range num {
 		shards = append(shards, testNewShard(t, i))
 	}
 

pkg/local_object_storage/engine/gc_test.go

@@ -29,7 +29,7 @@ func TestChildrenExpiration(t *testing.T) {
 	owner := usertest.ID()
 
 	e := New()
-	for i := 0; i < numOfShards; i++ {
+	for i := range numOfShards {
 		_, err := e.AddShard(
 			shard.WithBlobStorOptions(
 				blobstor.WithStorages(