use testutil peer in sess
Brian Tiger Chow committed
Dec 23, 2014 at 15:10 UTC
b551e45ae9a2ac5792fc484aa82d63a36d9ebcec
1 file changed
+10
-5
exchange/bitswap/testutils.go
+10
-5
@@ -12,6 +12,7 @@ import (
12
peer "github.com/jbenet/go-ipfs/peer"
13
datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
14
delay "github.com/jbenet/go-ipfs/util/delay"
15
+ testutil "github.com/jbenet/go-ipfs/util/testutil"
16
)
17
18
func NewSessionGenerator(
@@ -40,7 +41,11 @@ func (g *SessionGenerator) Close() error {
41
42
func (g *SessionGenerator) Next() Instance {
43
g.seq++
43
- return session(g.ctx, g.net, peer.ID(g.seq))
44
+ p, err := testutil.RandPeer()
45
+ if err != nil {
46
+ panic("FIXME") // TODO change signature
47
+ }
48
+ return session(g.ctx, g.net, p)
49
}
50
51
func (g *SessionGenerator) Instances(n int) []Instance {
@@ -73,9 +78,9 @@ func (i *Instance) SetBlockstoreLatency(t time.Duration) time.Duration {
78
// NB: It's easy make mistakes by providing the same peer ID to two different
79
// sessions. To safeguard, use the SessionGenerator to generate sessions. It's
80
// just a much better idea.
76
-func session(ctx context.Context, net tn.Network, p peer.ID) Instance {
81
+func session(ctx context.Context, net tn.Network, p testutil.Peer) Instance {
82
78
- adapter := net.Adapter(p)
83
+ adapter := net.Adapter(p.ID())
84
85
bsdelay := delay.Fixed(0)
86
const kWriteCacheElems = 100
@@ -87,10 +92,10 @@ func session(ctx context.Context, net tn.Network, p peer.ID) Instance {
92
93
const alwaysSendToPeer = true
94
90
- bs := New(ctx, p, adapter, bstore, alwaysSendToPeer)
95
+ bs := New(ctx, p.ID(), adapter, bstore, alwaysSendToPeer)
96
97
return Instance{
93
- Peer: p,
98
+ Peer: p.ID(),
99
Exchange: bs,
100
blockstore: bstore,
101
blockstoreDelay: bsdelay,