transition dht to mock2
Juan Batiz-Benet committed
Dec 17, 2014 at 08:02 UTC
dd33f6d9dca06f2ca0ca2c45aca58cbe86920eee
1 file changed
+15
-24
routing/dht/ext_test.go
+15
-24
@@ -7,15 +7,15 @@ import (
7
crand "crypto/rand"
8
9
inet "github.com/jbenet/go-ipfs/net"
10
- mocknet "github.com/jbenet/go-ipfs/net/mock"
10
+ mocknet "github.com/jbenet/go-ipfs/net/mock2"
11
peer "github.com/jbenet/go-ipfs/peer"
12
routing "github.com/jbenet/go-ipfs/routing"
13
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
14
u "github.com/jbenet/go-ipfs/util"
15
testutil "github.com/jbenet/go-ipfs/util/testutil"
16
17
- ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
17
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
+ ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
19
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
20
21
"time"
@@ -27,16 +27,15 @@ func TestGetFailures(t *testing.T) {
27
}
28
29
ctx := context.Background()
30
- peerstore := peer.NewPeerstore()
31
- local := makePeerString(t, "")
32
- peers := []peer.Peer{local, testutil.RandPeer()}
33
-
34
- nets, err := mocknet.MakeNetworks(ctx, peers)
30
+ mn, err := mocknet.FullMeshConnected(ctx, 2)
31
if err != nil {
32
t.Fatal(err)
33
}
34
+ nets := mn.Nets()
35
+ peers := mn.Peers()
36
39
- d := NewDHT(ctx, peers[0], peerstore, nets[0], ds.NewMapDatastore())
37
+ ps := peer.NewPeerstore()
38
+ d := NewDHT(ctx, peers[0], ps, nets[0], ds.NewMapDatastore())
39
d.Update(ctx, peers[1])
40
41
// This one should time out
@@ -141,17 +140,13 @@ func TestNotFound(t *testing.T) {
140
}
141
142
ctx := context.Background()
144
- peerstore := peer.NewPeerstore()
145
-
146
- var peers []peer.Peer
147
- for i := 0; i < 16; i++ {
148
- peers = append(peers, testutil.RandPeer())
149
- }
150
-
151
- nets, err := mocknet.MakeNetworks(ctx, peers)
143
+ mn, err := mocknet.FullMeshConnected(ctx, 16)
144
if err != nil {
145
t.Fatal(err)
146
}
147
+ nets := mn.Nets()
148
+ peers := mn.Peers()
149
+ peerstore := peer.NewPeerstore()
150
151
d := NewDHT(ctx, peers[0], peerstore, nets[0], ds.NewMapDatastore())
152
@@ -215,17 +210,13 @@ func TestLessThanKResponses(t *testing.T) {
210
// t.Skip("skipping test because it makes a lot of output")
211
212
ctx := context.Background()
218
- peerstore := peer.NewPeerstore()
219
-
220
- var peers []peer.Peer
221
- for i := 0; i < 6; i++ {
222
- peers = append(peers, testutil.RandPeer())
223
- }
224
-
225
- nets, err := mocknet.MakeNetworks(ctx, peers)
213
+ mn, err := mocknet.FullMeshConnected(ctx, 6)
214
if err != nil {
215
t.Fatal(err)
216
}
217
+ nets := mn.Nets()
218
+ peers := mn.Peers()
219
+ peerstore := peer.NewPeerstore()
220
221
d := NewDHT(ctx, peers[0], peerstore, nets[0], ds.NewMapDatastore())
222