opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 02:30:39 +08:00
Code Issues Projects Releases Wiki Activity

use the core.NewIPFSNode constructor

Browse Source 
NB: all commits (from master) pass tests up to this point.

fix: squashme into use core constructor
This commit is contained in:
Brian Tiger Chow
2015-01-10 20:05:53 -08:00
parent 401b8f413d
commit 5c46597c53
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/epictest/addcat_test.go
View File

@ -11,7 +11,9 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
"github.com/jbenet/go-ipfs/core"
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
"github.com/jbenet/go-ipfs/p2p/peer"
errors "github.com/jbenet/go-ipfs/util/debugerror" errors "github.com/jbenet/go-ipfs/util/debugerror"
testutil "github.com/jbenet/go-ipfs/util/testutil" testutil "github.com/jbenet/go-ipfs/util/testutil"
) )
@ -100,17 +102,17 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
return errors.New("test initialization error") return errors.New("test initialization error")
} }
adder, err := makeCore(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)) adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)))
if err != nil { if err != nil {
return err return err
} }
catter, err := makeCore(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)) catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)))
if err != nil { if err != nil {
return err return err
} }
adder.Bootstrap(ctx, catter.Peerstore.PeerInfo(catter.PeerHost.ID())) catter.Bootstrap(ctx, []peer.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)})
catter.Bootstrap(ctx, adder.Peerstore.PeerInfo(adder.PeerHost.ID())) adder.Bootstrap(ctx, []peer.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)})
keyAdded, err := adder.Add(bytes.NewReader(data)) keyAdded, err := adder.Add(bytes.NewReader(data))
if err != nil { if err != nil {

12
test/epictest/three_legged_cat_test.go
View File

@ -7,7 +7,9 @@ import (
"testing" "testing"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
"github.com/jbenet/go-ipfs/core"
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
"github.com/jbenet/go-ipfs/p2p/peer"
errors "github.com/jbenet/go-ipfs/util/debugerror" errors "github.com/jbenet/go-ipfs/util/debugerror"
testutil "github.com/jbenet/go-ipfs/util/testutil" testutil "github.com/jbenet/go-ipfs/util/testutil"
) )
@ -43,21 +45,21 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
if len(peers) < numPeers { if len(peers) < numPeers {
return errors.New("test initialization error") return errors.New("test initialization error")
} }
adder, err := makeCore(ctx, MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)) adder, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[0], mn.Host(peers[0]), conf)))
if err != nil { if err != nil {
return err return err
} }
catter, err := makeCore(ctx, MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)) catter, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[1], mn.Host(peers[1]), conf)))
if err != nil { if err != nil {
return err return err
} }
bootstrap, err := makeCore(ctx, MocknetTestRepo(peers[2], mn.Host(peers[2]), conf)) bootstrap, err := core.NewIPFSNode(ctx, core.ConfigOption(MocknetTestRepo(peers[2], mn.Host(peers[2]), conf)))
if err != nil { if err != nil {
return err return err
} }
boostrapInfo := bootstrap.Peerstore.PeerInfo(bootstrap.PeerHost.ID()) boostrapInfo := bootstrap.Peerstore.PeerInfo(bootstrap.PeerHost.ID())
adder.Bootstrap(ctx, boostrapInfo) adder.Bootstrap(ctx, []peer.PeerInfo{boostrapInfo})
catter.Bootstrap(ctx, boostrapInfo) catter.Bootstrap(ctx, []peer.PeerInfo{boostrapInfo})
keyAdded, err := adder.Add(bytes.NewReader(data)) keyAdded, err := adder.Add(bytes.NewReader(data))
if err != nil { if err != nil {