absorb {crypto,peer} test utils. (#8)

Avoids circular module dependency.
libp2p · May 23, 2019 · d090163 · d090163
1 parent 0a9354a
commit d090163
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 8 deletions.
diff --git a/core/crypto/key_test.go b/core/crypto/key_test.go
@@ -7,7 +7,7 @@ import (
 
 	. "github.com/libp2p/go-libp2p-core/crypto"
 	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-	"github.com/libp2p/go-libp2p-testing/crypto"
+	"github.com/libp2p/go-libp2p-core/test"
 )
 
 func TestKeys(t *testing.T) {
@@ -17,7 +17,7 @@ func TestKeys(t *testing.T) {
 }
 
 func testKeyType(typ int, t *testing.T) {
-	sk, pk, err := tcrypto.RandTestKeyPair(typ, 512)
+	sk, pk, err := test.RandTestKeyPair(typ, 512)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -114,7 +114,7 @@ func testKeyEquals(t *testing.T, k Key) {
 		t.Fatal("Key not equal to key with same bytes.")
 	}
 
-	sk, pk, err := tcrypto.RandTestKeyPair(RSA, 512)
+	sk, pk, err := test.RandTestKeyPair(RSA, 512)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/core/peer/peer_serde_test.go b/core/peer/peer_serde_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/libp2p/go-libp2p-core/peer"
-	. "github.com/libp2p/go-libp2p-testing/peer"
+	. "github.com/libp2p/go-libp2p-core/test"
 )
 
 func TestPeerSerdePB(t *testing.T) {

diff --git a/core/peer/peer_test.go b/core/peer/peer_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 
 	ic "github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-testing/crypto"
+	"github.com/libp2p/go-libp2p-core/test"
 
 	. "github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-testing/peer"
+	"github.com/libp2p/go-libp2p-core/test"
 
 	b58 "github.com/mr-tron/base58/base58"
 	mh "github.com/multiformats/go-multihash"
@@ -49,7 +49,7 @@ type keyset struct {
 
 func (ks *keyset) generate() error {
 	var err error
-	ks.sk, ks.pk, err = tcrypto.RandTestKeyPair(ic.RSA, 512)
+	ks.sk, ks.pk, err = test.RandTestKeyPair(ic.RSA, 512)
 	if err != nil {
 		return err
 	}
@@ -217,7 +217,7 @@ func TestValidate(t *testing.T) {
 	}
 
 	// Non-empty peer ID validates
-	p, err := tpeer.RandPeerID()
+	p, err := test.RandPeerID()
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/core/test/crypto.go b/core/test/crypto.go
@@ -0,0 +1,25 @@
+package test
+
+import (
+	"math/rand"
+	"sync/atomic"
+	"time"
+
+	ci "github.com/libp2p/go-libp2p-core/crypto"
+)
+
+var generatedPairs int64 = 0
+
+func RandTestKeyPair(typ, bits int) (ci.PrivKey, ci.PubKey, error) {
+	seed := time.Now().UnixNano()
+
+	// workaround for low time resolution
+	seed += atomic.AddInt64(&generatedPairs, 1) << 32
+
+	return SeededTestKeyPair(typ, bits, time.Now().UnixNano())
+}
+
+func SeededTestKeyPair(typ, bits int, seed int64) (ci.PrivKey, ci.PubKey, error) {
+	r := rand.New(rand.NewSource(seed))
+	return ci.GenerateKeyPairWithReader(typ, bits, r)
+}
diff --git a/core/test/peer.go b/core/test/peer.go
@@ -0,0 +1,30 @@
+package test
+
+import (
+	"io"
+	"math/rand"
+	"testing"
+	"time"
+
+	"github.com/libp2p/go-libp2p-core/peer"
+
+	mh "github.com/multiformats/go-multihash"
+)
+
+func RandPeerID() (peer.ID, error) {
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	buf := make([]byte, 16)
+	if _, err := io.ReadFull(r, buf); err != nil {
+		return "", err
+	}
+	h, _ := mh.Sum(buf, mh.SHA2_256, -1)
+	return peer.ID(h), nil
+}
+
+func RandPeerIDFatal(t testing.TB) peer.ID {
+	p, err := RandPeerID()
+	if err != nil {
+		t.Fatal(err)
+	}
+	return p
+}