use the core.NewIPFSNode constructor
NB: all commits (from master) pass tests up to this point. fix: squashme into use core constructor
Brian Tiger Chow committed
Jan 10, 2015 at 20:05 UTC
5c46597c532b70ec1aee11d45199cc331272d29f
2 files changed
+13
-9
test/epictest/addcat_test.go
+6
-4
@@ -11,7 +11,9 @@ import (
11
12
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
14
+ "github.com/jbenet/go-ipfs/core"
15
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
16
+ "github.com/jbenet/go-ipfs/p2p/peer"
17
errors "github.com/jbenet/go-ipfs/util/debugerror"
18
testutil "github.com/jbenet/go-ipfs/util/testutil"
19
)
@@ -100,17 +102,17 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
102
return errors.New("test initialization error")
103
}
104
103
- adder, err := makeCore(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf))
105
+ adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)))
106
if err != nil {
107
return err
108
}
107
- catter, err := makeCore(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf))
109
+ catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)))
110
if err != nil {
111
return err
112
}
113
112
- adder.Bootstrap(ctx, catter.Peerstore.PeerInfo(catter.PeerHost.ID()))
113
- catter.Bootstrap(ctx, adder.Peerstore.PeerInfo(adder.PeerHost.ID()))
114
+ catter.Bootstrap(ctx, []peer.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)})
115
+ adder.Bootstrap(ctx, []peer.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)})
116
117
keyAdded, err := adder.Add(bytes.NewReader(data))
118
if err != nil {
test/epictest/three_legged_cat_test.go
+7
-5
@@ -7,7 +7,9 @@ import (
7
"testing"
8
9
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
+ "github.com/jbenet/go-ipfs/core"
11
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
12
+ "github.com/jbenet/go-ipfs/p2p/peer"
13
errors "github.com/jbenet/go-ipfs/util/debugerror"
14
testutil "github.com/jbenet/go-ipfs/util/testutil"
15
)
@@ -43,21 +45,21 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
45
if len(peers) < numPeers {
46
return errors.New("test initialization error")
47
}
46
- adder, err := makeCore(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf))
48
+ adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)))
49
if err != nil {
50
return err
51
}
50
- catter, err := makeCore(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf))
52
+ catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)))
53
if err != nil {
54
return err
55
}
54
- bootstrap, err := makeCore(ctx, MocknetTestRepo(peers[2], mn.Host(peers[2]), conf))
56
+ bootstrap, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[2], mn.Host(peers[2]), conf)))
57
if err != nil {
58
return err
59
}
60
boostrapInfo := bootstrap.Peerstore.PeerInfo(bootstrap.PeerHost.ID())
59
- adder.Bootstrap(ctx, boostrapInfo)
60
- catter.Bootstrap(ctx, boostrapInfo)
61
+ adder.Bootstrap(ctx, []peer.PeerInfo{boostrapInfo})
62
+ catter.Bootstrap(ctx, []peer.PeerInfo{boostrapInfo})
63
64
keyAdded, err := adder.Add(bytes.NewReader(data))
65
if err != nil {