switch to StreamingSet in cid

License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
ipfs · Aug 15, 2018 · 5b87efc · 5b87efc
1 parent c0e2f54
commit 5b87efc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go
@@ -7,7 +7,6 @@ import (
 
 	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
 	caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
-	"github.com/ipfs/go-ipfs/thirdparty/streaming-cid-set"
 
 	dag "gx/ipfs/QmQzSpSjkdGHW6WFBhUG6P3t9K8yv7iucucT1cQaqJ6tgd/go-merkledag"
 	routing "gx/ipfs/QmSD6bSPcXaaR7LpQHjytLWQD7DrCsb415CWfpbd9Szemb/go-libp2p-routing"
@@ -99,7 +98,7 @@ func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) er
 }
 
 func provideKeysRec(ctx context.Context, r routing.IpfsRouting, bs blockstore.Blockstore, cids []*cid.Cid) error {
-	provided := streamingset.NewStreamingSet()
+	provided := cid.NewStreamingSet()
 
 	errCh := make(chan error)
 	go func() {

diff --git a/exchange/reprovide/providers.go b/exchange/reprovide/providers.go
@@ -5,7 +5,6 @@ import (
 
 	pin "github.com/ipfs/go-ipfs/pin"
 
-	"github.com/ipfs/go-ipfs/thirdparty/streaming-cid-set"
 	merkledag "gx/ipfs/QmQzSpSjkdGHW6WFBhUG6P3t9K8yv7iucucT1cQaqJ6tgd/go-merkledag"
 	blocks "gx/ipfs/QmYBEfMSquSGnuxBthUoBJNs3F6p4VAPPvAgxq6XXGvTPh/go-ipfs-blockstore"
 	cid "gx/ipfs/QmYjnkEL7i731PirfVH1sis89evN7jt4otSHw5D2xXXwUV/go-cid"
@@ -44,8 +43,8 @@ func NewPinnedProvider(pinning pin.Pinner, dag ipld.DAGService, onlyRoots bool)
 	}
 }
 
-func pinSet(ctx context.Context, pinning pin.Pinner, dag ipld.DAGService, onlyRoots bool) (*streamingset.StreamingSet, error) {
-	set := streamingset.NewStreamingSet()
+func pinSet(ctx context.Context, pinning pin.Pinner, dag ipld.DAGService, onlyRoots bool) (*cid.StreamingSet, error) {
+	set := cid.NewStreamingSet()
 
 	go func() {
 		ctx, cancel := context.WithCancel(ctx)

diff --git a/thirdparty/streaming-cid-set/set.go b/thirdparty/streaming-cid-set/set.go