migrate to consolidated types. (#31)

go.mod

@@ -2,17 +2,14 @@ module github.com/libp2p/go-libp2p-pubsub-router
 
 require (
 	github.com/ipfs/go-cid v0.0.2
-	github.com/ipfs/go-datastore v0.0.1
+	github.com/ipfs/go-datastore v0.0.5
 	github.com/ipfs/go-ipfs-ds-help v0.0.1
 	github.com/ipfs/go-ipfs-util v0.0.1
 	github.com/ipfs/go-log v0.0.1
-	github.com/libp2p/go-libp2p-blankhost v0.0.1
-	github.com/libp2p/go-libp2p-host v0.0.3
-	github.com/libp2p/go-libp2p-peer v0.1.1
-	github.com/libp2p/go-libp2p-peerstore v0.0.6
-	github.com/libp2p/go-libp2p-pubsub v0.0.5
-	github.com/libp2p/go-libp2p-record v0.0.1
-	github.com/libp2p/go-libp2p-routing v0.0.1
-	github.com/libp2p/go-libp2p-routing-helpers v0.0.2
-	github.com/libp2p/go-libp2p-swarm v0.0.6
+	github.com/libp2p/go-libp2p-blankhost v0.1.1
+	github.com/libp2p/go-libp2p-core v0.0.1
+	github.com/libp2p/go-libp2p-pubsub v0.1.0
+	github.com/libp2p/go-libp2p-record v0.1.0
+	github.com/libp2p/go-libp2p-routing-helpers v0.1.0
+	github.com/libp2p/go-libp2p-swarm v0.1.0
 )

pubsub.go

@@ -8,19 +8,19 @@ import (
 	"sync"
 	"time"
 
-	cid "github.com/ipfs/go-cid"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/routing"
+
+	pubsub "github.com/libp2p/go-libp2p-pubsub"
+	record "github.com/libp2p/go-libp2p-record"
+
+	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	dshelp "github.com/ipfs/go-ipfs-ds-help"
 	u "github.com/ipfs/go-ipfs-util"
 	logging "github.com/ipfs/go-log"
-	p2phost "github.com/libp2p/go-libp2p-host"
-	peer "github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
-	pubsub "github.com/libp2p/go-libp2p-pubsub"
-	record "github.com/libp2p/go-libp2p-record"
-	routing "github.com/libp2p/go-libp2p-routing"
-	ropts "github.com/libp2p/go-libp2p-routing/options"
 )
 
 var log = logging.Logger("pubsub-valuestore")
@@ -33,7 +33,7 @@ type watchGroup struct {
 type PubsubValueStore struct {
 	ctx  context.Context
 	ds   ds.Datastore
-	host p2phost.Host
+	host host.Host
 	cr   routing.ContentRouting
 	ps   *pubsub.PubSub
 
@@ -60,7 +60,7 @@ func KeyToTopic(key string) string {
 // NewPubsubPublisher constructs a new Publisher that publishes IPNS records through pubsub.
 // The constructor interface is complicated by the need to bootstrap the pubsub topic.
 // This could be greatly simplified if the pubsub implementation handled bootstrap itself
-func NewPubsubValueStore(ctx context.Context, host p2phost.Host, cr routing.ContentRouting, ps *pubsub.PubSub, validator record.Validator) *PubsubValueStore {
+func NewPubsubValueStore(ctx context.Context, host host.Host, cr routing.ContentRouting, ps *pubsub.PubSub, validator record.Validator) *PubsubValueStore {
 	return &PubsubValueStore{
 		ctx: ctx,
 
@@ -77,7 +77,7 @@ func NewPubsubValueStore(ctx context.Context, host p2phost.Host, cr routing.Cont
 }
 
 // Publish publishes an IPNS record through pubsub with default TTL
-func (p *PubsubValueStore) PutValue(ctx context.Context, key string, value []byte, opts ...ropts.Option) error {
+func (p *PubsubValueStore) PutValue(ctx context.Context, key string, value []byte, opts ...routing.Option) error {
 	// Record-store keys are arbitrary binary. However, pubsub requires UTF-8 string topic IDs.
 	// Encode to "/record/base64url(key)"
 	topic := KeyToTopic(key)
@@ -175,7 +175,7 @@ func (p *PubsubValueStore) getLocal(key string) ([]byte, error) {
 	return val, nil
 }
 
-func (p *PubsubValueStore) GetValue(ctx context.Context, key string, opts ...ropts.Option) ([]byte, error) {
+func (p *PubsubValueStore) GetValue(ctx context.Context, key string, opts ...routing.Option) ([]byte, error) {
 	if err := p.Subscribe(key); err != nil {
 		return nil, err
 	}
@@ -183,7 +183,7 @@ func (p *PubsubValueStore) GetValue(ctx context.Context, key string, opts ...rop
 	return p.getLocal(key)
 }
 
-func (p *PubsubValueStore) SearchValue(ctx context.Context, key string, opts ...ropts.Option) (<-chan []byte, error) {
+func (p *PubsubValueStore) SearchValue(ctx context.Context, key string, opts ...routing.Option) (<-chan []byte, error) {
 	if err := p.Subscribe(key); err != nil {
 		return nil, err
 	}
@@ -328,7 +328,7 @@ func (p *PubsubValueStore) notifyWatchers(key string, data []byte) {
 
 // rendezvous with peers in the name topic through provider records
 // Note: rendezvous/boostrap should really be handled by the pubsub implementation itself!
-func bootstrapPubsub(ctx context.Context, cr routing.ContentRouting, host p2phost.Host, name string) {
+func bootstrapPubsub(ctx context.Context, cr routing.ContentRouting, host host.Host, name string) {
 	// TODO: consider changing this to `pubsub:...`
 	topic := "floodsub:" + name
 	hash := u.Hash([]byte(topic))
@@ -362,7 +362,7 @@ func bootstrapPubsub(ctx context.Context, cr routing.ContentRouting, host p2phos
 			continue
 		}
 		wg.Add(1)
-		go func(pi pstore.PeerInfo) {
+		go func(pi peer.AddrInfo) {
 			defer wg.Done()
 
 			ctx, cancel := context.WithTimeout(ctx, time.Second*10)

pubsub_test.go

@@ -6,22 +6,23 @@ import (
 	"testing"
 	"time"
 
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/routing"
+
 	bhost "github.com/libp2p/go-libp2p-blankhost"
-	p2phost "github.com/libp2p/go-libp2p-host"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	record "github.com/libp2p/go-libp2p-record"
-	routing "github.com/libp2p/go-libp2p-routing"
 	rhelper "github.com/libp2p/go-libp2p-routing-helpers"
 	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
 )
 
-func newNetHost(ctx context.Context, t *testing.T) p2phost.Host {
+func newNetHost(ctx context.Context, t *testing.T) host.Host {
 	netw := swarmt.GenSwarm(t, ctx)
 	return bhost.NewBlankHost(netw)
 }
 
-func newNetHosts(ctx context.Context, t *testing.T, n int) []p2phost.Host {
-	var out []p2phost.Host
+func newNetHosts(ctx context.Context, t *testing.T, n int) []host.Host {
+	var out []host.Host
 
 	for i := 0; i < n; i++ {
 		h := newNetHost(ctx, t)