refactor(integrationtest) use RoutingOptions in mocknet repo
Brian Tiger Chow committed
Feb 6, 2015 at 07:56 UTC
f17ede8334856832aa3c93ba162c1465803963da
4 files changed
+23
-20
test/integration/addcat_test.go
+2
-2
@@ -104,12 +104,12 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
104
return errors.New("test initialization error")
105
}
106
107
- adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)))
107
+ adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf, core.DHTOption)))
108
if err != nil {
109
return err
110
}
111
defer adder.Close()
112
- catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)))
112
+ catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf, core.DHTOption)))
113
if err != nil {
114
return err
115
}
test/integration/bitswap_wo_routing_test.go
+1
-1
@@ -34,7 +34,7 @@ func TestBitswapWithoutRouting(t *testing.T) {
34
35
var nodes []*core.IpfsNode
36
for _, p := range peers {
37
- n, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(p, mn.Host(p), conf)))
37
+ n, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(p, mn.Host(p), conf, core.DHTOption)))
38
if err != nil {
39
t.Fatal(err)
40
}
test/integration/core.go
+17
-14
@@ -4,6 +4,7 @@ import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
6
syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
7
+ ds2 "github.com/jbenet/go-ipfs/util/datastore2"
8
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
9
core "github.com/jbenet/go-ipfs/core"
10
bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
@@ -11,16 +12,14 @@ import (
12
host "github.com/jbenet/go-ipfs/p2p/host"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
"github.com/jbenet/go-ipfs/repo"
14
- dht "github.com/jbenet/go-ipfs/routing/dht"
15
delay "github.com/jbenet/go-ipfs/thirdparty/delay"
16
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
- ds2 "github.com/jbenet/go-ipfs/util/datastore2"
17
testutil "github.com/jbenet/go-ipfs/util/testutil"
18
)
19
20
var log = eventlog.Logger("epictest")
21
23
-func MocknetTestRepo(p peer.ID, h host.Host, conf testutil.LatencyConfig) core.ConfigOption {
22
+func MocknetTestRepo(p peer.ID, h host.Host, conf testutil.LatencyConfig, routing core.RoutingOption) core.ConfigOption {
23
return func(ctx context.Context) (*core.IpfsNode, error) {
24
const kWriteCacheElems = 100
25
const alwaysSendToPeer = true
@@ -30,22 +29,26 @@ func MocknetTestRepo(p peer.ID, h host.Host, conf testutil.LatencyConfig) core.C
29
}
30
ds := r.Datastore()
31
33
- log.Debugf("MocknetTestRepo: %s %s %s", p, h.ID(), h)
34
- dhtt := dht.NewDHT(ctx, h, ds)
32
+ n := &core.IpfsNode{
33
+ Peerstore: h.Peerstore(),
34
+ Repo: r,
35
+ PeerHost: h,
36
+ Identity: p,
37
+ }
38
+ dhtt, err := routing(ctx, n)
39
+ if err != nil {
40
+ return nil, err
41
+ }
42
+
43
bsn := bsnet.NewFromIpfsHost(h, dhtt)
44
bstore, err := blockstore.WriteCached(blockstore.NewBlockstore(ds), kWriteCacheElems)
45
if err != nil {
46
return nil, err
47
}
48
exch := bitswap.New(ctx, p, bsn, bstore, alwaysSendToPeer)
41
- return &core.IpfsNode{
42
- Peerstore: h.Peerstore(),
43
- Blockstore: bstore,
44
- Exchange: exch,
45
- Repo: r,
46
- PeerHost: h,
47
- Routing: dhtt,
48
- Identity: p,
49
- }, nil
49
+ n.Blockstore = bstore
50
+ n.Exchange = exch
51
+ n.Routing = dhtt
52
+ return n, nil
53
}
54
}
test/integration/three_legged_cat_test.go
+3
-3
@@ -80,17 +80,17 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
80
if len(peers) < numPeers {
81
return errors.New("test initialization error")
82
}
83
- bootstrap, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[2], mn.Host(peers[2]), conf))
83
+ bootstrap, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[2], mn.Host(peers[2]), conf, core.DHTOption))
84
if err != nil {
85
return err
86
}
87
defer bootstrap.Close()
88
- adder, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf))
88
+ adder, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf, core.DHTOption))
89
if err != nil {
90
return err
91
}
92
defer adder.Close()
93
- catter, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf))
93
+ catter, err := core.NewIPFSNode(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf, core.DHTOption))
94
if err != nil {
95
return err
96
}