handle error from changed NewFloodSub method
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jan 27, 2018 at 18:59 UTC
faae63fcf1895a11603beaed9fcd994015146da3
2 files changed
+18
-4
core/core.go
+5
-1
@@ -250,7 +250,11 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin
250
}
251
252
if pubsub || ipnsps {
253
- n.Floodsub = floodsub.NewFloodSub(ctx, peerhost)
253
+ service, err := floodsub.NewFloodSub(ctx, peerhost)
254
+ if err != nil {
255
+ return err
256
+ }
257
+ n.Floodsub = service
258
}
259
260
if ipnsps {
namesys/pubsub_test.go
+13
-3
@@ -100,7 +100,11 @@ func TestPubsubPublishSubscribe(t *testing.T) {
100
101
pubhost := newNetHost(ctx, t)
102
pubmr := newMockRouting(ms, ks, pubhost)
103
- pub := NewPubsubPublisher(ctx, pubhost, ds.NewMapDatastore(), pubmr, floodsub.NewFloodSub(ctx, pubhost))
103
+ fs, err := floodsub.NewFloodSub(ctx, pubhost)
104
+ if err != nil {
105
+ t.Fatal(err)
106
+ }
107
+ pub := NewPubsubPublisher(ctx, pubhost, ds.NewMapDatastore(), pubmr, fs)
108
privk := pubhost.Peerstore().PrivKey(pubhost.ID())
109
pubpinfo := pstore.PeerInfo{ID: pubhost.ID(), Addrs: pubhost.Addrs()}
110
@@ -110,7 +114,13 @@ func TestPubsubPublishSubscribe(t *testing.T) {
114
resmrs := newMockRoutingForHosts(ms, ks, reshosts)
115
res := make([]*PubsubResolver, len(reshosts))
116
for i := 0; i < len(res); i++ {
113
- res[i] = NewPubsubResolver(ctx, reshosts[i], resmrs[i], ks, floodsub.NewFloodSub(ctx, reshosts[i]))
117
+
118
+ fs, err := floodsub.NewFloodSub(ctx, reshosts[i])
119
+ if err != nil {
120
+ t.Fatal(err)
121
+ }
122
+
123
+ res[i] = NewPubsubResolver(ctx, reshosts[i], resmrs[i], ks, fs)
124
if err := reshosts[i].Connect(ctx, pubpinfo); err != nil {
125
t.Fatal(err)
126
}
@@ -127,7 +137,7 @@ func TestPubsubPublishSubscribe(t *testing.T) {
137
time.Sleep(time.Second * 1)
138
139
val := path.Path("/ipfs/QmP1DfoUjiWH2ZBo1PBH6FupdBucbDepx3HpWmEY6JMUpY")
130
- err := pub.Publish(ctx, privk, val)
140
+ err = pub.Publish(ctx, privk, val)
141
if err != nil {
142
t.Fatal(err)
143
}