From c82dcf7e1610c05981146b4a7daf62b771901f9f Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Mon, 30 May 2022 21:49:30 +0300 Subject: [PATCH] [#401] internal: Place randomization code in random package Also replace seeding into `init` function. Signed-off-by: Leonard Lyubich --- internal/rand.go | 12 ------------ internal/random/rand.go | 15 +++++++++++++++ object/test/generate.go | 10 +++++----- session/test/generate.go | 4 ++-- 4 files changed, 22 insertions(+), 19 deletions(-) delete mode 100644 internal/rand.go create mode 100644 internal/random/rand.go diff --git a/internal/rand.go b/internal/rand.go deleted file mode 100644 index 23ab1a79..00000000 --- a/internal/rand.go +++ /dev/null @@ -1,12 +0,0 @@ -package internal - -import ( - "math/rand" - "time" -) - -// RandUint32 returns random uint32 value [0, max). -func RandUint32(max uint32) uint32 { - rand.Seed(time.Now().UnixNano()) - return rand.Uint32() % max -} diff --git a/internal/random/rand.go b/internal/random/rand.go new file mode 100644 index 00000000..db2c087f --- /dev/null +++ b/internal/random/rand.go @@ -0,0 +1,15 @@ +package random + +import ( + "math/rand" + "time" +) + +func init() { + rand.Seed(time.Now().UnixNano()) +} + +// Uint32 returns random uint32 value [0, max). +func Uint32(max uint32) uint32 { + return rand.Uint32() % max +} diff --git a/object/test/generate.go b/object/test/generate.go index 22646f75..0c6ffab4 100644 --- a/object/test/generate.go +++ b/object/test/generate.go @@ -1,7 +1,7 @@ package objecttest import ( - "github.com/nspcc-dev/neofs-api-go/v2/internal" + "github.com/nspcc-dev/neofs-api-go/v2/internal/random" "github.com/nspcc-dev/neofs-api-go/v2/object" "github.com/nspcc-dev/neofs-api-go/v2/refs" refstest "github.com/nspcc-dev/neofs-api-go/v2/refs/test" @@ -186,7 +186,7 @@ func GenerateGetResponseBody(empty bool) *object.GetResponseBody { m := new(object.GetResponseBody) if !empty { - switch internal.RandUint32(3) { + switch random.Uint32(3) { case 0: m.SetObjectPart(GenerateGetObjectPartInit(false)) case 1: @@ -240,7 +240,7 @@ func GeneratePutRequestBody(empty bool) *object.PutRequestBody { m := new(object.PutRequestBody) if !empty { - switch internal.RandUint32(2) { + switch random.Uint32(2) { case 0: m.SetObjectPart(GeneratePutObjectPartInit(false)) case 1: @@ -362,7 +362,7 @@ func GenerateHeadResponseBody(empty bool) *object.HeadResponseBody { m := new(object.HeadResponseBody) if !empty { - switch internal.RandUint32(3) { + switch random.Uint32(3) { case 0: m.SetHeaderPart(GenerateHeaderWithSignature(false)) case 1: @@ -524,7 +524,7 @@ func GenerateGetRangeResponseBody(empty bool) *object.GetRangeResponseBody { m := new(object.GetRangeResponseBody) if !empty { - switch internal.RandUint32(2) { + switch random.Uint32(2) { case 0: m.SetRangePart(GenerateGetRangePartChunk(false)) case 1: diff --git a/session/test/generate.go b/session/test/generate.go index e040b817..25976bce 100644 --- a/session/test/generate.go +++ b/session/test/generate.go @@ -2,7 +2,7 @@ package sessiontest import ( acltest "github.com/nspcc-dev/neofs-api-go/v2/acl/test" - "github.com/nspcc-dev/neofs-api-go/v2/internal" + "github.com/nspcc-dev/neofs-api-go/v2/internal/random" refstest "github.com/nspcc-dev/neofs-api-go/v2/refs/test" "github.com/nspcc-dev/neofs-api-go/v2/session" statustest "github.com/nspcc-dev/neofs-api-go/v2/status/test" @@ -167,7 +167,7 @@ func GenerateSessionTokenBody(empty bool) *session.TokenBody { m.SetOwnerID(refstest.GenerateOwnerID(false)) m.SetLifetime(GenerateTokenLifetime(false)) - switch internal.RandUint32(2) { + switch random.Uint32(2) { case 0: m.SetContext(GenerateObjectSessionContext(false)) case 1: