From 09a2e1f64cc8a70f8affe00e3703047194f96776 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sun, 4 Jan 2015 14:06:53 -0800
Subject: [PATCH] testutil: obvious names for seeded key pairs

---
 namesys/resolve_test.go   | 2 +-
 p2p/crypto/key_test.go    | 4 ++--
 p2p/net/mock/mock_net.go  | 2 +-
 p2p/net/mock/mock_test.go | 8 ++++----
 p2p/peer/peer_test.go     | 2 +-
 util/testutil/gen.go      | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go
index 35851fc32..8e3214dfe 100644
--- a/namesys/resolve_test.go
+++ b/namesys/resolve_test.go
@@ -14,7 +14,7 @@ func TestRoutingResolve(t *testing.T) {
 	resolver := NewRoutingResolver(d)
 	publisher := NewRoutingPublisher(d)
 
-	privk, pubk, err := testutil.RandKeyPair(512)
+	privk, pubk, err := testutil.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/p2p/crypto/key_test.go b/p2p/crypto/key_test.go
index fa2ad7799..f4a9599f8 100644
--- a/p2p/crypto/key_test.go
+++ b/p2p/crypto/key_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestRsaKeys(t *testing.T) {
-	sk, pk, err := tu.RandKeyPair(512)
+	sk, pk, err := tu.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -93,7 +93,7 @@ func testKeyEquals(t *testing.T, k Key) {
 		t.Fatal("Key not equal to key with same bytes.")
 	}
 
-	sk, pk, err := tu.RandKeyPair(512)
+	sk, pk, err := tu.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go
index 1bb9ddf5a..664ef1a2b 100644
--- a/p2p/net/mock/mock_net.go
+++ b/p2p/net/mock/mock_net.go
@@ -45,7 +45,7 @@ func New(ctx context.Context) Mocknet {
 }
 
 func (mn *mocknet) GenPeer() (host.Host, error) {
-	sk, _, err := testutil.SeededKeyPair(time.Now().UnixNano())
+	sk, _, err := testutil.SeededTestKeyPair(time.Now().UnixNano())
 	if err != nil {
 		return nil, err
 	}
diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go
index 268b35f4d..1b1ca7ddb 100644
--- a/p2p/net/mock/mock_test.go
+++ b/p2p/net/mock/mock_test.go
@@ -26,15 +26,15 @@ func randPeer(t *testing.T) peer.ID {
 func TestNetworkSetup(t *testing.T) {
 
 	ctx := context.Background()
-	sk1, _, err := testutil.RandKeyPair(512)
+	sk1, _, err := testutil.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(t)
 	}
-	sk2, _, err := testutil.RandKeyPair(512)
+	sk2, _, err := testutil.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(t)
 	}
-	sk3, _, err := testutil.RandKeyPair(512)
+	sk3, _, err := testutil.RandTestKeyPair(512)
 	if err != nil {
 		t.Fatal(t)
 	}
@@ -398,7 +398,7 @@ func TestAdding(t *testing.T) {
 
 	peers := []peer.ID{}
 	for i := 0; i < 3; i++ {
-		sk, _, err := testutil.RandKeyPair(512)
+		sk, _, err := testutil.RandTestKeyPair(512)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/p2p/peer/peer_test.go b/p2p/peer/peer_test.go
index b19d0faef..d5bd793fd 100644
--- a/p2p/peer/peer_test.go
+++ b/p2p/peer/peer_test.go
@@ -41,7 +41,7 @@ type keyset struct {
 
 func (ks *keyset) generate() error {
 	var err error
-	ks.sk, ks.pk, err = tu.RandKeyPair(512)
+	ks.sk, ks.pk, err = tu.RandTestKeyPair(512)
 	if err != nil {
 		return err
 	}
diff --git a/util/testutil/gen.go b/util/testutil/gen.go
index 93bca120d..2097c6117 100644
--- a/util/testutil/gen.go
+++ b/util/testutil/gen.go
@@ -29,11 +29,11 @@ func init() {
 	ZeroLocalTCPAddress = maddr
 }
 
-func RandKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
+func RandTestKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
 	return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
 }
 
-func SeededKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
+func SeededTestKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
 	return ci.GenerateKeyPairWithReader(ci.RSA, 512, u.NewSeededRand(seed))
 }
 
@@ -142,7 +142,7 @@ func RandPeerNetParams() (*PeerNetParams, error) {
 	var p PeerNetParams
 	var err error
 	p.Addr = ZeroLocalTCPAddress
-	p.PrivKey, p.PubKey, err = RandKeyPair(512)
+	p.PrivKey, p.PubKey, err = RandTestKeyPair(512)
 	if err != nil {
 		return nil, err
 	}