clean up test setup interface
Jeromy committed
Jan 2, 2015 at 08:33 UTC
da04d267796560c37d4a36b33d50c82338c85ff2
3 files changed
+12
-12
net/mock/mock_net.go
+1
-1
@@ -41,7 +41,7 @@ func New(ctx context.Context) Mocknet {
41
}
42
43
func (mn *mocknet) GenPeer() (inet.Network, error) {
44
- sk, _, err := testutil.SeededKeyPair(512, int64(len(mn.nets)))
44
+ sk, _, err := testutil.SeededKeyPair(int64(len(mn.nets)))
45
if err != nil {
46
return nil, err
47
}
routing/dht/dht_test.go
+9
-9
@@ -32,9 +32,9 @@ func init() {
32
}
33
}
34
35
-func setupDHT(ctx context.Context, t *testing.T, addr ma.Multiaddr, seed int64) *IpfsDHT {
35
+func setupDHT(ctx context.Context, t *testing.T, addr ma.Multiaddr) *IpfsDHT {
36
37
- sk, pk, err := testutil.SeededKeyPair(512, seed)
37
+ sk, pk, err := testutil.SeededKeyPair(time.Now().UnixNano())
38
if err != nil {
39
t.Fatal(err)
40
}
@@ -70,7 +70,7 @@ func setupDHTS(ctx context.Context, n int, t *testing.T) ([]ma.Multiaddr, []peer
70
71
for i := 0; i < n; i++ {
72
addrs[i] = testutil.RandLocalTCPAddress()
73
- dhts[i] = setupDHT(ctx, t, addrs[i], int64(i))
73
+ dhts[i] = setupDHT(ctx, t, addrs[i])
74
peers[i] = dhts[i].self
75
}
76
@@ -119,8 +119,8 @@ func TestPing(t *testing.T) {
119
addrA := testutil.RandLocalTCPAddress()
120
addrB := testutil.RandLocalTCPAddress()
121
122
- dhtA := setupDHT(ctx, t, addrA, 1)
123
- dhtB := setupDHT(ctx, t, addrB, 2)
122
+ dhtA := setupDHT(ctx, t, addrA)
123
+ dhtB := setupDHT(ctx, t, addrB)
124
125
peerA := dhtA.self
126
peerB := dhtB.self
@@ -152,8 +152,8 @@ func TestValueGetSet(t *testing.T) {
152
addrA := testutil.RandLocalTCPAddress()
153
addrB := testutil.RandLocalTCPAddress()
154
155
- dhtA := setupDHT(ctx, t, addrA, 1)
156
- dhtB := setupDHT(ctx, t, addrB, 2)
155
+ dhtA := setupDHT(ctx, t, addrA)
156
+ dhtB := setupDHT(ctx, t, addrB)
157
158
defer dhtA.Close()
159
defer dhtB.Close()
@@ -636,8 +636,8 @@ func TestConnectCollision(t *testing.T) {
636
addrA := testutil.RandLocalTCPAddress()
637
addrB := testutil.RandLocalTCPAddress()
638
639
- dhtA := setupDHT(ctx, t, addrA, int64((rtime*2)+1))
640
- dhtB := setupDHT(ctx, t, addrB, int64((rtime*2)+2))
639
+ dhtA := setupDHT(ctx, t, addrA)
640
+ dhtB := setupDHT(ctx, t, addrB)
641
642
peerA := dhtA.self
643
peerB := dhtB.self
util/testutil/gen.go
+2
-2
@@ -20,8 +20,8 @@ func RandKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
20
return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
21
}
22
23
-func SeededKeyPair(bits int, seed int64) (ci.PrivKey, ci.PubKey, error) {
24
- return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewSeededRand(seed))
23
+func SeededKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
24
+ return ci.GenerateKeyPairWithReader(ci.RSA, 512, u.NewSeededRand(seed))
25
}
26
27
// RandPeerID generates random "valid" peer IDs. it does not NEED to generate