refactor: rename testutil func
Brian Tiger Chow committed
Dec 23, 2014 at 18:02 UTC
a85aa9b5da2f778f9b6e9bdb167089f7d8a47df7
6 files changed
+29
-35
net/backpressure/backpressure_test.go
+1
-1
@@ -18,7 +18,7 @@ import (
18
var log = eventlog.Logger("backpressure")
19
20
func GenNetwork(t *testing.T, ctx context.Context) (inet.Network, error) {
21
- p := testutil.RandPeerNetParams(t)
21
+ p := testutil.RandPeerNetParamsOrFatal(t)
22
ps := peer.NewPeerstore()
23
ps.AddAddress(p.ID, p.Addr)
24
ps.AddPubKey(p.ID, p.PubKey)
net/conn/dial_test.go
+4
-4
@@ -49,8 +49,8 @@ func setupSingleConn(t *testing.T, ctx context.Context) (a, b Conn, p1, p2 tu.Pe
49
50
func setupConn(t *testing.T, ctx context.Context, secure bool) (a, b Conn, p1, p2 tu.PeerNetParams) {
51
52
- p1 = tu.RandPeerNetParams(t)
53
- p2 = tu.RandPeerNetParams(t)
52
+ p1 = tu.RandPeerNetParamsOrFatal(t)
53
+ p2 = tu.RandPeerNetParamsOrFatal(t)
54
laddr := p1.Addr
55
56
key1 := p1.PrivKey
@@ -95,8 +95,8 @@ func setupConn(t *testing.T, ctx context.Context, secure bool) (a, b Conn, p1, p
95
func testDialer(t *testing.T, secure bool) {
96
// t.Skip("Skipping in favor of another test")
97
98
- p1 := tu.RandPeerNetParams(t)
99
- p2 := tu.RandPeerNetParams(t)
98
+ p1 := tu.RandPeerNetParamsOrFatal(t)
99
+ p2 := tu.RandPeerNetParamsOrFatal(t)
100
101
key1 := p1.PrivKey
102
key2 := p2.PrivKey
net/id_test.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
)
15
16
func GenNetwork(t *testing.T, ctx context.Context) inet.Network {
17
- p := testutil.RandPeerNetParams(t)
17
+ p := testutil.RandPeerNetParamsOrFatal(t)
18
ps := peer.NewPeerstore()
19
ps.AddAddress(p.ID, p.Addr)
20
ps.AddPubKey(p.ID, p.PubKey)
net/swarm/swarm_test.go
+1
-1
@@ -51,7 +51,7 @@ func makeSwarms(ctx context.Context, t *testing.T, num int) ([]*Swarm, []testuti
51
peersnp := make([]testutil.PeerNetParams, 0, num)
52
53
for i := 0; i < num; i++ {
54
- localnp := testutil.RandPeerNetParams(t)
54
+ localnp := testutil.RandPeerNetParamsOrFatal(t)
55
peersnp = append(peersnp, localnp)
56
57
peerstore := peer.NewPeerstore()
util/testutil/gen.go
+15
-7
@@ -107,21 +107,29 @@ func (p *PeerNetParams) checkKeys() error {
107
return nil // ok. move along.
108
}
109
110
-func RandPeerNetParams(t *testing.T) (p PeerNetParams) {
110
+func RandPeerNetParamsOrFatal(t *testing.T) PeerNetParams {
111
+ p, err := RandPeerNetParams()
112
+ if err != nil {
113
+ t.Fatal(err)
114
+ return PeerNetParams{} // TODO return nil
115
+ }
116
+ return *p
117
+}
118
+
119
+func RandPeerNetParams() (*PeerNetParams, error) {
120
+ var p PeerNetParams
121
var err error
122
p.Addr = RandLocalTCPAddress()
123
p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512)
124
if err != nil {
115
- t.Fatal(err)
125
+ return nil, err
126
}
117
-
127
p.ID, err = peer.IDFromPublicKey(p.PubKey)
128
if err != nil {
120
- t.Fatal(err)
129
+ return nil, err
130
}
122
-
131
if err := p.checkKeys(); err != nil {
124
- t.Fatal(err)
132
+ return nil, err
133
}
126
- return p
134
+ return &p, nil
135
}
util/testutil/peer.go
+7
-21
@@ -1,38 +1,24 @@
1
package testutil
2
3
import (
4
- "testing"
5
-
4
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
5
ci "github.com/jbenet/go-ipfs/crypto"
8
- ipfspeer "github.com/jbenet/go-ipfs/peer"
6
+ peer "github.com/jbenet/go-ipfs/peer"
7
)
8
9
type Peer interface {
10
Address() ma.Multiaddr
13
- ID() ipfspeer.ID
11
+ ID() peer.ID
12
PrivateKey() ci.PrivKey
13
PublicKey() ci.PubKey
14
}
15
18
-func RandPeer(t *testing.T) Peer {
19
- p := RandPeerNetParams(t)
20
- var err error
21
- p.Addr = RandLocalTCPAddress()
22
- p.PrivKey, p.PubKey, err = ci.GenerateKeyPair(ci.RSA, 512)
23
- if err != nil {
24
- t.Fatal(err)
25
- }
26
-
27
- p.ID, err = ipfspeer.IDFromPublicKey(p.PubKey)
16
+func RandPeer() (Peer, error) {
17
+ p, err := RandPeerNetParams()
18
if err != nil {
29
- t.Fatal(err)
30
- }
31
-
32
- if err := p.checkKeys(); err != nil {
33
- t.Fatal(err)
19
+ return nil, err
20
}
35
- return &testpeer{p}
21
+ return &testpeer{*p}, nil
22
}
23
24
// peer is a temporary shim to delay binding of PeerNetParams.
@@ -40,7 +26,7 @@ type testpeer struct {
26
PeerNetParams
27
}
28
43
-func (p *testpeer) ID() ipfspeer.ID {
29
+func (p *testpeer) ID() peer.ID {
30
return p.PeerNetParams.ID
31
}
32