*: predeclared linter; min and max funcs will be available soon

Signed-off-by: Pavel Karpy <[email protected]>
nspcc-dev · Aug 20, 2024 · 5bed985 · 5bed985
1 parent 67d3c9c
commit 5bed985
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 31 deletions.
diff --git a/pkg/innerring/config.go b/pkg/innerring/config.go
@@ -305,17 +305,17 @@ func parseConfigUint64Condition(v *viper.Viper, key, desc string, cond func(uint
 	return res, nil
 }
 
-func parseConfigUint64Range(v *viper.Viper, key, desc string, min, max uint64) (uint64, error) {
+func parseConfigUint64Range(v *viper.Viper, key, desc string, minU, maxU uint64) (uint64, error) {
 	return parseConfigUint64Condition(v, key, desc, func(val uint64) error {
-		if val < min || val > max {
-			return fmt.Errorf("out of allowable range [%d:%d]", min, max)
+		if val < minU || val > maxU {
+			return fmt.Errorf("out of allowable range [%d:%d]", minU, maxU)
 		}
 		return nil
 	})
 }
 
-func parseConfigUint64Max(v *viper.Viper, key, desc string, max uint64) (uint64, error) {
-	return parseConfigUint64Range(v, key, desc, 0, max)
+func parseConfigUint64Max(v *viper.Viper, key, desc string, maxU uint64) (uint64, error) {
+	return parseConfigUint64Range(v, key, desc, 0, maxU)
 }
 
 func parseConfigDurationCondition(v *viper.Viper, key, desc string, cond func(time.Duration) error) (time.Duration, error) {

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/common.go b/pkg/local_object_storage/blobstor/internal/blobstortest/common.go
@@ -25,21 +25,21 @@ type objectDesc struct {
 	storageID []byte
 }
 
-func TestAll(t *testing.T, cons Constructor, min, max uint64) {
+func TestAll(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	t.Run("get", func(t *testing.T) {
-		TestGet(t, cons, min, max)
+		TestGet(t, cons, minSize, maxSize)
 	})
 	t.Run("get range", func(t *testing.T) {
-		TestGetRange(t, cons, min, max)
+		TestGetRange(t, cons, minSize, maxSize)
 	})
 	t.Run("delete", func(t *testing.T) {
-		TestDelete(t, cons, min, max)
+		TestDelete(t, cons, minSize, maxSize)
 	})
 	t.Run("exists", func(t *testing.T) {
-		TestExists(t, cons, min, max)
+		TestExists(t, cons, minSize, maxSize)
 	})
 	t.Run("iterate", func(t *testing.T) {
-		TestIterate(t, cons, min, max)
+		TestIterate(t, cons, minSize, maxSize)
 	})
 }
 
@@ -49,11 +49,11 @@ func TestInfo(t *testing.T, cons Constructor, expectedType string, expectedPath
 	require.Equal(t, expectedPath, s.Path())
 }
 
-func prepare(t *testing.T, count int, s common.Storage, min, max uint64) []objectDesc {
+func prepare(t *testing.T, count int, s common.Storage, minSize, maxSize uint64) []objectDesc {
 	objects := make([]objectDesc, count)
 
 	for i := range objects {
-		objects[i].obj = NewObject(min + uint64(rand.Intn(int(max-min+1)))) // not too large
+		objects[i].obj = NewObject(minSize + uint64(rand.Intn(int(maxSize-minSize+1)))) // not too large
 		objects[i].addr = objectCore.AddressOf(objects[i].obj)
 		objects[i].raw = objects[i].obj.Marshal()
 	}

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/control.go b/pkg/local_object_storage/blobstor/internal/blobstortest/control.go
@@ -11,12 +11,12 @@ import (
 
 // TestControl checks correctness of a read-only mode.
 // cons must return a storage which is NOT opened.
-func TestControl(t *testing.T, cons Constructor, min, max uint64) {
+func TestControl(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 
-	objects := prepare(t, 10, s, min, max)
+	objects := prepare(t, 10, s, minSize, maxSize)
 	require.NoError(t, s.Close())
 
 	require.NoError(t, s.Open(true))
@@ -32,7 +32,7 @@ func TestControl(t *testing.T, cons Constructor, min, max uint64) {
 
 	t.Run("put fails", func(t *testing.T) {
 		var prm common.PutPrm
-		prm.Object = NewObject(min + uint64(rand.Intn(int(max-min+1))))
+		prm.Object = NewObject(minSize + uint64(rand.Intn(int(maxSize-minSize+1))))
 		prm.Address = objectCore.AddressOf(prm.Object)
 
 		_, err := s.Put(prm)

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go b/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestDelete(t *testing.T, cons Constructor, min, max uint64) {
+func TestDelete(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 	t.Cleanup(func() { require.NoError(t, s.Close()) })
 
-	objects := prepare(t, 4, s, min, max)
+	objects := prepare(t, 4, s, minSize, maxSize)
 
 	t.Run("delete non-existent", func(t *testing.T) {
 		var prm common.DeletePrm

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go b/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go
@@ -8,13 +8,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestExists(t *testing.T, cons Constructor, min, max uint64) {
+func TestExists(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 	t.Cleanup(func() { require.NoError(t, s.Close()) })
 
-	objects := prepare(t, 1, s, min, max)
+	objects := prepare(t, 1, s, minSize, maxSize)
 
 	t.Run("missing object", func(t *testing.T) {
 		prm := common.ExistsPrm{Address: oidtest.Address()}

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestGet(t *testing.T, cons Constructor, min, max uint64) {
+func TestGet(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 	t.Cleanup(func() { require.NoError(t, s.Close()) })
 
-	objects := prepare(t, 2, s, min, max)
+	objects := prepare(t, 2, s, minSize, maxSize)
 
 	t.Run("missing object", func(t *testing.T) {
 		gPrm := common.GetPrm{Address: oidtest.Address()}

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go
@@ -10,13 +10,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestGetRange(t *testing.T, cons Constructor, min, max uint64) {
+func TestGetRange(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 	t.Cleanup(func() { require.NoError(t, s.Close()) })
 
-	objects := prepare(t, 1, s, min, max)
+	objects := prepare(t, 1, s, minSize, maxSize)
 
 	t.Run("missing object", func(t *testing.T) {
 		gPrm := common.GetRangePrm{Address: oidtest.Address()}

diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestIterate(t *testing.T, cons Constructor, min, max uint64) {
+func TestIterate(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 	s := cons(t)
 	require.NoError(t, s.Open(false))
 	require.NoError(t, s.Init())
 	t.Cleanup(func() { require.NoError(t, s.Close()) })
 
-	objects := prepare(t, 10, s, min, max)
+	objects := prepare(t, 10, s, minSize, maxSize)
 
 	// Delete random object to ensure it is not iterated over.
 	const delID = 2

diff --git a/pkg/morph/client/notary.go b/pkg/morph/client/notary.go
@@ -637,8 +637,8 @@ func (c *Client) notaryTxValidationLimit() (uint32, error) {
 		return 0, fmt.Errorf("can't get current blockchain height: %w", err)
 	}
 
-	min := bc + c.notary.txValidTime
-	rounded := (min/c.notary.roundTime + 1) * c.notary.roundTime
+	minBlock := bc + c.notary.txValidTime
+	rounded := (minBlock/c.notary.roundTime + 1) * c.notary.roundTime
 
 	return rounded, nil
 }

diff --git a/pkg/services/audit/auditor/pdp.go b/pkg/services/audit/auditor/pdp.go
@@ -90,11 +90,11 @@ func (c *Context) splitPayload(id oid.ID) []uint64 {
 
 	for i := uint64(0); i < hashRangeNumber; i++ {
 		if i < hashRangeNumber-1 {
-			max := size - prev - (hashRangeNumber - i)
-			if max == 0 {
+			maxPayload := size - prev - (hashRangeNumber - i)
+			if maxPayload == 0 {
 				prev++
 			} else {
-				prev += rand.Uint64()%max + 1
+				prev += rand.Uint64()%maxPayload + 1
 			}
 		} else {
 			prev = size