Migrate math/rand to math/rand/v2

Signed-off-by: Erik Westra <[email protected]>

ulid.go

@@ -22,7 +22,7 @@ import (
 	"io"
 	"math"
 	"math/bits"
-	"math/rand"
+	"math/rand/v2"
 	"sync"
 	"time"
 )
@@ -133,7 +133,9 @@ func MustNewDefault(t time.Time) ULID {
 }
 
 var defaultEntropy = func() io.Reader {
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
+	seed := [32]byte{}
+	binary.LittleEndian.PutUint64(seed[:8], uint64(time.Now().UnixNano()))
+	rng := rand.NewChaCha8(seed)
 	return &LockedMonotonicReader{MonotonicReader: Monotonic(rng, 0)}
 }()
 

ulid_test.go

@@ -20,8 +20,7 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"math/rand"
-	randV2 "math/rand/v2"
+	"math/rand/v2"
 	"strings"
 	"testing"
 	"testing/iotest"
@@ -33,9 +32,11 @@ import (
 
 func ExampleULID() {
 	t := time.Unix(1000000, 0)
-	entropy := ulid.Monotonic(rand.New(rand.NewSource(t.UnixNano())), 0)
+	rng := createChaCha8RNG(t)
+
+	entropy := ulid.Monotonic(rng, 0)
 	fmt.Println(ulid.MustNew(ulid.Timestamp(t), entropy))
-	// Output: 0000XSNJG0MQJHBF4QX1EFD6Y3
+	// Output: 0000XSNJG02VZD8JHMTREXTNAH
 }
 
 func TestNew(t *testing.T) {
@@ -420,9 +421,8 @@ func TestULIDTime(t *testing.T) {
 		t.Errorf("got err %v, want %v", got, want)
 	}
 
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
 	for i := 0; i < 1e6; i++ {
-		ms := uint64(rng.Int63n(int64(maxTime)))
+		ms := uint64(rand.Int64N(int64(maxTime)))
 
 		var id ulid.ULID
 		if err := id.SetTime(ms); err != nil {
@@ -589,13 +589,12 @@ func TestScan(t *testing.T) {
 }
 
 func TestMonotonic(t *testing.T) {
-	now := ulid.Now()
 	for _, e := range []struct {
 		name string
 		mk   func() io.Reader
 	}{
 		{"cryptorand", func() io.Reader { return crand.Reader }},
-		{"mathrand", func() io.Reader { return rand.New(rand.NewSource(int64(now))) }},
+		{"mathrand", func() io.Reader { return createChaCha8RNG(time.Now()) }},
 	} {
 		for _, inc := range []uint64{
 			0,
@@ -657,7 +656,7 @@ func TestMonotonicSafe(t *testing.T) {
 	t.Parallel()
 
 	var (
-		rng  = rand.New(rand.NewSource(time.Now().UnixNano()))
+		rng  = createChaCha8RNG(time.Now())
 		safe = &ulid.LockedMonotonicReader{MonotonicReader: ulid.Monotonic(rng, 0)}
 		t0   = ulid.Timestamp(time.Now())
 	)
@@ -691,7 +690,7 @@ func TestMonotonicSafe(t *testing.T) {
 
 func TestULID_Bytes(t *testing.T) {
 	tt := time.Unix(1000000, 0)
-	entropy := ulid.Monotonic(rand.New(rand.NewSource(tt.UnixNano())), 0)
+	entropy := ulid.Monotonic(createChaCha8RNG(tt), 0)
 	id := ulid.MustNew(ulid.Timestamp(tt), entropy)
 	bid := id.Bytes()
 	bid[len(bid)-1]++
@@ -700,6 +699,12 @@ func TestULID_Bytes(t *testing.T) {
 	}
 }
 
+func createChaCha8RNG(t time.Time) *rand.ChaCha8 {
+	seed := [32]byte{}
+	binary.LittleEndian.PutUint64(seed[:8], uint64(t.UnixNano()))
+	return rand.NewChaCha8(seed)
+}
+
 func BenchmarkNew(b *testing.B) {
 	benchmarkMakeULID(b, func(timestamp uint64, entropy io.Reader) {
 		_, _ = ulid.New(timestamp, entropy)
@@ -716,11 +721,7 @@ func benchmarkMakeULID(b *testing.B, f func(uint64, io.Reader)) {
 	b.ReportAllocs()
 	b.SetBytes(int64(len(ulid.ULID{})))
 
-	nanoNow := time.Now().UnixNano()
-	rng := rand.New(rand.NewSource(nanoNow))
-	seed := [32]byte{}
-	binary.BigEndian.PutUint64(seed[:8], uint64(nanoNow))
-	chachaRng := randV2.NewChaCha8(seed)
+	rng := createChaCha8RNG(time.Now())
 
 	for _, tc := range []struct {
 		name       string
@@ -729,15 +730,10 @@ func benchmarkMakeULID(b *testing.B, f func(uint64, io.Reader)) {
 	}{
 		{"WithCrypoEntropy", []uint64{123}, crand.Reader},
 		{"WithEntropy", []uint64{123}, rng},
-		{"WithChaChaEntropy", []uint64{123}, chachaRng},
 		{"WithMonotonicEntropy_SameTimestamp_Inc0", []uint64{123}, ulid.Monotonic(rng, 0)},
-		{"WithMonotonicEntropy_SameTimestamp_Inc0_ChaCha", []uint64{123}, ulid.Monotonic(chachaRng, 0)},
 		{"WithMonotonicEntropy_DifferentTimestamp_Inc0", []uint64{122, 123}, ulid.Monotonic(rng, 0)},
-		{"WithMonotonicEntropy_DifferentTimestamp_Inc0_ChaCha", []uint64{122, 123}, ulid.Monotonic(chachaRng, 0)},
 		{"WithMonotonicEntropy_SameTimestamp_Inc1", []uint64{123}, ulid.Monotonic(rng, 1)},
-		{"WithMonotonicEntropy_SameTimestamp_Inc1_ChaCha", []uint64{123}, ulid.Monotonic(chachaRng, 1)},
 		{"WithMonotonicEntropy_DifferentTimestamp_Inc1", []uint64{122, 123}, ulid.Monotonic(rng, 1)},
-		{"WithMonotonicEntropy_DifferentTimestamp_Inc1_ChaCha", []uint64{122, 123}, ulid.Monotonic(chachaRng, 1)},
 		{"WithCryptoMonotonicEntropy_SameTimestamp_Inc1", []uint64{123}, ulid.Monotonic(crand.Reader, 1)},
 		{"WithCryptoMonotonicEntropy_DifferentTimestamp_Inc1", []uint64{122, 123}, ulid.Monotonic(crand.Reader, 1)},
 		{"WithoutEntropy", []uint64{123}, nil},
@@ -779,7 +775,7 @@ func BenchmarkMustParse(b *testing.B) {
 }
 
 func BenchmarkString(b *testing.B) {
-	entropy := rand.New(rand.NewSource(time.Now().UnixNano()))
+	entropy := createChaCha8RNG(time.Now())
 	id := ulid.MustNew(123456, entropy)
 	b.SetBytes(int64(len(id)))
 	b.ResetTimer()
@@ -789,7 +785,7 @@ func BenchmarkString(b *testing.B) {
 }
 
 func BenchmarkMarshal(b *testing.B) {
-	entropy := rand.New(rand.NewSource(time.Now().UnixNano()))
+	entropy := createChaCha8RNG(time.Now())
 	buf := make([]byte, ulid.EncodedSize)
 	id := ulid.MustNew(123456, entropy)