testutil: obvious names for seeded key pairs
Juan Batiz-Benet committed
Jan 4, 2015 at 14:06 UTC
09a2e1f64cc8a70f8affe00e3703047194f96776
6 files changed
+12
-12
namesys/resolve_test.go
+1
-1
@@ -14,7 +14,7 @@ func TestRoutingResolve(t *testing.T) {
14
resolver := NewRoutingResolver(d)
15
publisher := NewRoutingPublisher(d)
16
17
- privk, pubk, err := testutil.RandKeyPair(512)
17
+ privk, pubk, err := testutil.RandTestKeyPair(512)
18
if err != nil {
19
t.Fatal(err)
20
}
p2p/crypto/key_test.go
+2
-2
@@ -9,7 +9,7 @@ import (
9
)
10
11
func TestRsaKeys(t *testing.T) {
12
- sk, pk, err := tu.RandKeyPair(512)
12
+ sk, pk, err := tu.RandTestKeyPair(512)
13
if err != nil {
14
t.Fatal(err)
15
}
@@ -93,7 +93,7 @@ func testKeyEquals(t *testing.T, k Key) {
93
t.Fatal("Key not equal to key with same bytes.")
94
}
95
96
- sk, pk, err := tu.RandKeyPair(512)
96
+ sk, pk, err := tu.RandTestKeyPair(512)
97
if err != nil {
98
t.Fatal(err)
99
}
p2p/net/mock/mock_net.go
+1
-1
@@ -45,7 +45,7 @@ func New(ctx context.Context) Mocknet {
45
}
46
47
func (mn *mocknet) GenPeer() (host.Host, error) {
48
- sk, _, err := testutil.SeededKeyPair(time.Now().UnixNano())
48
+ sk, _, err := testutil.SeededTestKeyPair(time.Now().UnixNano())
49
if err != nil {
50
return nil, err
51
}
p2p/net/mock/mock_test.go
+4
-4
@@ -26,15 +26,15 @@ func randPeer(t *testing.T) peer.ID {
26
func TestNetworkSetup(t *testing.T) {
27
28
ctx := context.Background()
29
- sk1, _, err := testutil.RandKeyPair(512)
29
+ sk1, _, err := testutil.RandTestKeyPair(512)
30
if err != nil {
31
t.Fatal(t)
32
}
33
- sk2, _, err := testutil.RandKeyPair(512)
33
+ sk2, _, err := testutil.RandTestKeyPair(512)
34
if err != nil {
35
t.Fatal(t)
36
}
37
- sk3, _, err := testutil.RandKeyPair(512)
37
+ sk3, _, err := testutil.RandTestKeyPair(512)
38
if err != nil {
39
t.Fatal(t)
40
}
@@ -398,7 +398,7 @@ func TestAdding(t *testing.T) {
398
399
peers := []peer.ID{}
400
for i := 0; i < 3; i++ {
401
- sk, _, err := testutil.RandKeyPair(512)
401
+ sk, _, err := testutil.RandTestKeyPair(512)
402
if err != nil {
403
t.Fatal(err)
404
}
p2p/peer/peer_test.go
+1
-1
@@ -41,7 +41,7 @@ type keyset struct {
41
42
func (ks *keyset) generate() error {
43
var err error
44
- ks.sk, ks.pk, err = tu.RandKeyPair(512)
44
+ ks.sk, ks.pk, err = tu.RandTestKeyPair(512)
45
if err != nil {
46
return err
47
}
util/testutil/gen.go
+3
-3
@@ -29,11 +29,11 @@ func init() {
29
ZeroLocalTCPAddress = maddr
30
}
31
32
-func RandKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
32
+func RandTestKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
33
return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
34
}
35
36
-func SeededKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
36
+func SeededTestKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
37
return ci.GenerateKeyPairWithReader(ci.RSA, 512, u.NewSeededRand(seed))
38
}
39
@@ -142,7 +142,7 @@ func RandPeerNetParams() (*PeerNetParams, error) {
142
var p PeerNetParams
143
var err error
144
p.Addr = ZeroLocalTCPAddress
145
- p.PrivKey, p.PubKey, err = RandKeyPair(512)
145
+ p.PrivKey, p.PubKey, err = RandTestKeyPair(512)
146
if err != nil {
147
return nil, err
148
}