opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

handle error from changed NewFloodSub method

Browse Source 
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
This commit is contained in:
Steven Allen
2018-01-27 18:59:58 -08:00
parent 5acbecc26b
commit faae63fcf1
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.go
View File

@ -250,7 +250,11 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin
} }
if pubsub || ipnsps { if pubsub || ipnsps {
n.Floodsub = floodsub.NewFloodSub(ctx, peerhost) service, err := floodsub.NewFloodSub(ctx, peerhost)
if err != nil {
return err
}
n.Floodsub = service
} }
if ipnsps { if ipnsps {

16
namesys/pubsub_test.go
View File

@ -100,7 +100,11 @@ func TestPubsubPublishSubscribe(t *testing.T) {
pubhost := newNetHost(ctx, t) pubhost := newNetHost(ctx, t)
pubmr := newMockRouting(ms, ks, pubhost) pubmr := newMockRouting(ms, ks, pubhost)
pub := NewPubsubPublisher(ctx, pubhost, ds.NewMapDatastore(), pubmr, floodsub.NewFloodSub(ctx, pubhost)) fs, err := floodsub.NewFloodSub(ctx, pubhost)
if err != nil {
t.Fatal(err)
}
pub := NewPubsubPublisher(ctx, pubhost, ds.NewMapDatastore(), pubmr, fs)
privk := pubhost.Peerstore().PrivKey(pubhost.ID()) privk := pubhost.Peerstore().PrivKey(pubhost.ID())
pubpinfo := pstore.PeerInfo{ID: pubhost.ID(), Addrs: pubhost.Addrs()} pubpinfo := pstore.PeerInfo{ID: pubhost.ID(), Addrs: pubhost.Addrs()}
@ -110,7 +114,13 @@ func TestPubsubPublishSubscribe(t *testing.T) {
resmrs := newMockRoutingForHosts(ms, ks, reshosts) resmrs := newMockRoutingForHosts(ms, ks, reshosts)
res := make([]*PubsubResolver, len(reshosts)) res := make([]*PubsubResolver, len(reshosts))
for i := 0; i < len(res); i++ { for i := 0; i < len(res); i++ {
res[i] = NewPubsubResolver(ctx, reshosts[i], resmrs[i], ks, floodsub.NewFloodSub(ctx, reshosts[i]))
fs, err := floodsub.NewFloodSub(ctx, reshosts[i])
if err != nil {
t.Fatal(err)
}
res[i] = NewPubsubResolver(ctx, reshosts[i], resmrs[i], ks, fs)
if err := reshosts[i].Connect(ctx, pubpinfo); err != nil { if err := reshosts[i].Connect(ctx, pubpinfo); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -127,7 +137,7 @@ func TestPubsubPublishSubscribe(t *testing.T) {
time.Sleep(time.Second * 1) time.Sleep(time.Second * 1)
val := path.Path("/ipfs/QmP1DfoUjiWH2ZBo1PBH6FupdBucbDepx3HpWmEY6JMUpY") val := path.Path("/ipfs/QmP1DfoUjiWH2ZBo1PBH6FupdBucbDepx3HpWmEY6JMUpY")
err := pub.Publish(ctx, privk, val) err = pub.Publish(ctx, privk, val)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }