device: use rand.NewSource instead of rand.Seed

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/device/allowedips_rand_test.go b/device/allowedips_rand_test.go
index 8dd9b67dd2137af529c988c422b93519958b6e37..b863696fb7b59e80af13e65d9c3d6833ae209e23 100644 (file)
--- a/device/allowedips_rand_test.go
+++ b/device/allowedips_rand_test.go
@@ -83,7 +83,7 @@ func TestTrieRandom(t *testing.T) {
        var peers []*Peer
        var allowedIPs AllowedIPs
 
-       rand.Seed(1)
+       rng := rand.New(rand.NewSource(1))
 
        for n := 0; n < NumberOfPeers; n++ {
                peers = append(peers, &Peer{})
@@ -91,14 +91,14 @@ func TestTrieRandom(t *testing.T) {
 
        for n := 0; n < NumberOfAddresses; n++ {
                var addr4 [4]byte
-               rand.Read(addr4[:])
+               rng.Read(addr4[:])
                cidr := uint8(rand.Intn(32) + 1)
                index := rand.Intn(NumberOfPeers)
                allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom4(addr4), int(cidr)), peers[index])
                slow4 = slow4.Insert(addr4[:], cidr, peers[index])
 
                var addr6 [16]byte
-               rand.Read(addr6[:])
+               rng.Read(addr6[:])
                cidr = uint8(rand.Intn(128) + 1)
                index = rand.Intn(NumberOfPeers)
                allowedIPs.Insert(netip.PrefixFrom(netip.AddrFrom16(addr6), int(cidr)), peers[index])
@@ -109,7 +109,7 @@ func TestTrieRandom(t *testing.T) {
        for p = 0; ; p++ {
                for n := 0; n < NumberOfTests; n++ {
                        var addr4 [4]byte
-                       rand.Read(addr4[:])
+                       rng.Read(addr4[:])
                        peer1 := slow4.Lookup(addr4[:])
                        peer2 := allowedIPs.Lookup(addr4[:])
                        if peer1 != peer2 {
@@ -117,7 +117,7 @@ func TestTrieRandom(t *testing.T) {
                        }
 
                        var addr6 [16]byte
-                       rand.Read(addr6[:])
+                       rng.Read(addr6[:])
                        peer1 = slow6.Lookup(addr6[:])
                        peer2 = allowedIPs.Lookup(addr6[:])
                        if peer1 != peer2 {

diff --git a/device/allowedips_test.go b/device/allowedips_test.go
index 0ce45af99b6deeaca61e656fc465688291f7c653..7df7da5b8ba7a3543ab3435d75f4db955019f34f 100644 (file)
--- a/device/allowedips_test.go
+++ b/device/allowedips_test.go
@@ -44,7 +44,7 @@ func benchmarkTrie(peerNumber, addressNumber, _ int, b *testing.B) {
        var peers []*Peer
        root := parentIndirection{&trie, 2}
 
-       rand.Seed(1)
+       rng := rand.New(rand.NewSource(1))
 
        const AddressLength = 4
 
@@ -54,15 +54,15 @@ func benchmarkTrie(peerNumber, addressNumber, _ int, b *testing.B) {
 
        for n := 0; n < addressNumber; n++ {
                var addr [AddressLength]byte
-               rand.Read(addr[:])
-               cidr := uint8(rand.Uint32() % (AddressLength * 8))
-               index := rand.Int() % peerNumber
+               rng.Read(addr[:])
+               cidr := uint8(rng.Uint32() % (AddressLength * 8))
+               index := rng.Int() % peerNumber
                root.insert(addr[:], cidr, peers[index])
        }
 
        for n := 0; n < b.N; n++ {
                var addr [AddressLength]byte
-               rand.Read(addr[:])
+               rng.Read(addr[:])
                trie.lookup(addr[:])
        }
 }