vendor for debug

go.mod

@@ -2,6 +2,14 @@ module github.com/joincloud/peers-touch-go
 
 go 1.14
 
+replace (
+    // github.com/ipfs/go-ipfs v0.6.0 => ../go-ipfs
+   //  github.com/libp2p/go-libp2p-pubsub v0.3.1 => ../go-libp2p-pubsub
+   //  github.com/libp2p/go-libp2p-core v0.5.7 => ../go-libp2p-core
+    // github.com/libp2p/go-libp2p v0.9.6 => ../go-libp2p
+    // github.com/ipfs/go-ipfs v0.6.0 => ../go-ipfs
+)
+
 require (
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/google/uuid v1.1.2 // indirect

pubsub/broker.go

@@ -69,6 +69,7 @@ func (b *broker) Pub(ctx context.Context, event Event) (err error) {
 	if err != nil {
 		panic(err)
 	}
+
 	logger.Debugf("pub id: %s", id.ID())
 	err = b.coreAPI.PubSub().Publish(ctx, event.Name(), bytes)
 	if err != nil {

tests/pubsub_test.go

@@ -2,39 +2,33 @@ package test
 
 import (
 	"context"
-	"github.com/libp2p/go-libp2p"
+	"testing"
 	"time"
 
 	"github.com/joincloud/peers-touch-go/pubsub"
 	. "github.com/smartystreets/goconvey/convey"
-	"testing"
 
 	_ "github.com/joincloud/peers-touch-go/codec/json"
 	_ "github.com/joincloud/peers-touch-go/logger/logrus"
-	"github.com/joincloud/peers-touch-go/node"
 )
 
 func TestBrokerSub(t *testing.T) {
-	/*
-		mocknet := testingMockNet(ctx)
-		node, clean := testingIPFSNode(ctx, t, mocknet)
-		defer clean()
+	ctx := context.Background()
 
-	ipfs := testingCoreAPI(t, node)*/
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	mocknet := testingMockNet(ctx)
+	node, clean := testingIPFSNode(ctx, t, mocknet)
+	defer clean()
 
-	Convey("test ", t, FailureHalts, func(c C) {
-		h, _ := libp2p.New(ctx)
-		n, err := node.NewNode(ctx, node.Host(h))
-		_, _ = c.Printf("nodeId: %s\n", n.ID().String())
-		_, _ = c.Printf("hid: %s\n", h.ID().String())
+	ipfs := testingCoreAPI(t, node)
 
-		c.So(err, ShouldBeNil)
+	Convey("test ", t, FailureHalts, func(c C) {
 		Convey("Create Broker", FailureHalts, func(c C) {
+			b := pubsub.NewBroker(pubsub.BrokerCoreAPI(ipfs))
+			c.So(b, ShouldNotBeNil)
+
 			ok := make(chan bool)
 			Convey("Create Sub", FailureHalts, func(c C) {
-				sub, err := n.Broker().Sub(ctx, "topic-test", func(event pubsub.Event) {
+				sub, err := b.Sub(ctx, "topic-test", func(event pubsub.Event) {
 					_, _ = c.Printf("receive evt: %s-%s", event.Name(), event.Message())
 					ok <- true
 				})
@@ -44,14 +38,16 @@ func TestBrokerSub(t *testing.T) {
 			})
 
 			Convey("Create Pub", FailureHalts, func(c C) {
-				err := n.Broker().Pub(ctx, pubsub.NewEvent("topic-test", pubsub.Message{Body: "Hello Everybody"}))
+				err := b.Pub(ctx, pubsub.NewEvent("topic-test", pubsub.Message{Body: "Hello Everybody"}))
 				c.So(err, ShouldBeNil)
 			})
+
+			select {
+			case <-ok:
+				return
+			case <-time.After(time.Second * 4):
+				return
+			}
 		})
 	})
-
-	select {
-	case <-time.After(time.Second * 3):
-		return
-	}
 }