提交 e671ab2f 作者: rht

Swap all 'crypto/rand' rng in tests with 'math/rand'

上级 c14ab9bd
...@@ -4,7 +4,6 @@ package ipns ...@@ -4,7 +4,6 @@ package ipns
import ( import (
"bytes" "bytes"
"crypto/rand"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
mrand "math/rand" mrand "math/rand"
...@@ -19,6 +18,7 @@ import ( ...@@ -19,6 +18,7 @@ import (
core "github.com/ipfs/go-ipfs/core" core "github.com/ipfs/go-ipfs/core"
coremock "github.com/ipfs/go-ipfs/core/mock" coremock "github.com/ipfs/go-ipfs/core/mock"
nsfs "github.com/ipfs/go-ipfs/ipnsfs" nsfs "github.com/ipfs/go-ipfs/ipnsfs"
u "github.com/ipfs/go-ipfs/util"
ci "github.com/ipfs/go-ipfs/util/testutil/ci" ci "github.com/ipfs/go-ipfs/util/testutil/ci"
) )
...@@ -30,7 +30,7 @@ func maybeSkipFuseTests(t *testing.T) { ...@@ -30,7 +30,7 @@ func maybeSkipFuseTests(t *testing.T) {
func randBytes(size int) []byte { func randBytes(size int) []byte {
b := make([]byte, size) b := make([]byte, size)
rand.Read(b) u.NewTimeSeededRand().Read(b)
return b return b
} }
......
...@@ -2,7 +2,6 @@ package balanced ...@@ -2,7 +2,6 @@ package balanced
import ( import (
"bytes" "bytes"
"crypto/rand"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
...@@ -130,7 +129,7 @@ func TestRabinBlockSize(t *testing.T) { ...@@ -130,7 +129,7 @@ func TestRabinBlockSize(t *testing.T) {
} }
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
nbytes := 1024 * 1024 nbytes := 1024 * 1024
io.CopyN(buf, rand.Reader, int64(nbytes)) io.CopyN(buf, u.NewTimeSeededRand(), int64(nbytes))
rab := chunk.NewMaybeRabin(4096) rab := chunk.NewMaybeRabin(4096)
blkch := rab.Split(buf) blkch := rab.Split(buf)
......
...@@ -2,14 +2,15 @@ package chunk ...@@ -2,14 +2,15 @@ package chunk
import ( import (
"bytes" "bytes"
"crypto/rand"
"io" "io"
"testing" "testing"
u "github.com/ipfs/go-ipfs/util"
) )
func randBuf(t *testing.T, size int) []byte { func randBuf(t *testing.T, size int) []byte {
buf := make([]byte, size) buf := make([]byte, size)
if _, err := rand.Read(buf); err != nil { if _, err := u.NewTimeSeededRand().Read(buf); err != nil {
t.Fatal("failed to read enough randomness") t.Fatal("failed to read enough randomness")
} }
return buf return buf
......
...@@ -2,7 +2,6 @@ package trickle ...@@ -2,7 +2,6 @@ package trickle
import ( import (
"bytes" "bytes"
"crypto/rand"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
...@@ -136,7 +135,7 @@ func TestRabinBlockSize(t *testing.T) { ...@@ -136,7 +135,7 @@ func TestRabinBlockSize(t *testing.T) {
} }
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
nbytes := 1024 * 1024 nbytes := 1024 * 1024
io.CopyN(buf, rand.Reader, int64(nbytes)) io.CopyN(buf, u.NewTimeSeededRand(), int64(nbytes))
rab := chunk.NewMaybeRabin(4096) rab := chunk.NewMaybeRabin(4096)
blkch := rab.Split(buf) blkch := rab.Split(buf)
......
package backpressure_tests package backpressure_tests
import ( import (
crand "crypto/rand"
"io" "io"
"math/rand" "math/rand"
"testing" "testing"
...@@ -15,6 +14,7 @@ import ( ...@@ -15,6 +14,7 @@ import (
eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog" eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
u "github.com/ipfs/go-ipfs/util"
) )
var log = eventlog.Logger("backpressure") var log = eventlog.Logger("backpressure")
...@@ -236,7 +236,7 @@ func TestStBackpressureStreamWrite(t *testing.T) { ...@@ -236,7 +236,7 @@ func TestStBackpressureStreamWrite(t *testing.T) {
// ready a buffer of random data // ready a buffer of random data
buf := make([]byte, 65536) buf := make([]byte, 65536)
crand.Read(buf) u.NewTimeSeededRand().Read(buf)
for { for {
// send a randomly sized subchunk // send a randomly sized subchunk
......
package reconnect package reconnect
import ( import (
crand "crypto/rand"
"io" "io"
"math/rand" "math/rand"
"sync" "sync"
...@@ -14,6 +13,7 @@ import ( ...@@ -14,6 +13,7 @@ import (
protocol "github.com/ipfs/go-ipfs/p2p/protocol" protocol "github.com/ipfs/go-ipfs/p2p/protocol"
testutil "github.com/ipfs/go-ipfs/p2p/test/util" testutil "github.com/ipfs/go-ipfs/p2p/test/util"
eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog" eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
u "github.com/ipfs/go-ipfs/util"
ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
...@@ -66,7 +66,7 @@ func newSender() (chan sendChans, func(s inet.Stream)) { ...@@ -66,7 +66,7 @@ func newSender() (chan sendChans, func(s inet.Stream)) {
buf := make([]byte, 65536) buf := make([]byte, 65536)
buf2 := make([]byte, 65536) buf2 := make([]byte, 65536)
crand.Read(buf) u.NewTimeSeededRand().Read(buf)
for { for {
select { select {
......
...@@ -2,7 +2,6 @@ package testutil ...@@ -2,7 +2,6 @@ package testutil
import ( import (
"bytes" "bytes"
crand "crypto/rand"
"errors" "errors"
"fmt" "fmt"
"io" "io"
...@@ -44,7 +43,7 @@ func SeededTestKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) { ...@@ -44,7 +43,7 @@ func SeededTestKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
// id, _ := peer.IDFromPublicKey(pk) // id, _ := peer.IDFromPublicKey(pk)
func RandPeerID() (peer.ID, error) { func RandPeerID() (peer.ID, error) {
buf := make([]byte, 16) buf := make([]byte, 16)
if _, err := io.ReadFull(crand.Reader, buf); err != nil { if _, err := io.ReadFull(u.NewTimeSeededRand(), buf); err != nil {
return "", err return "", err
} }
h := u.Hash(buf) h := u.Hash(buf)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论