switch to StreamingSet in cidutil

License: MIT Signed-off-by: Steven Allen <[email protected]>
ipfs · Sep 1, 2018 · 7553122 · 7553122
1 parent faea23b
commit 7553122
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 43 deletions.
diff --git a/core/coreapi/dht.go b/core/coreapi/dht.go
@@ -7,8 +7,8 @@ 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"
 
+	cidutil "gx/ipfs/QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5/go-cidutil"
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 	dag "gx/ipfs/QmRiQCJZ91B7VNmLvA6sxzDuBJGSojS3uXHHVuNr3iueNZ/go-merkledag"
 	routing "gx/ipfs/QmS4niovD1U6pRjUBXivr1zvvLBqiTKbERjFo994JU7oQS/go-libp2p-routing"
@@ -99,7 +99,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 := cidutil.NewStreamingSet()
 
 	errCh := make(chan error)
 	go func() {

diff --git a/exchange/reprovide/providers.go b/exchange/reprovide/providers.go
@@ -5,7 +5,7 @@ import (
 
 	pin "github.com/ipfs/go-ipfs/pin"
 
-	"github.com/ipfs/go-ipfs/thirdparty/streaming-cid-set"
+	cidutil "gx/ipfs/QmPyxJ2QS7L5FhGkNYkNcXHGjDhvGHueJ4auqAstFHYxy5/go-cidutil"
 	merkledag "gx/ipfs/QmRDaC5z6yXkXTTSWzaxs2sSVBon5RRCN6eNtMmpuHtKCr/go-merkledag"
 	ipld "gx/ipfs/QmX5CsuHyVZeTLxgRSYkgLSDQKb9UjE8xnhQzCEJWWWFsC/go-ipld-format"
 	cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
@@ -44,8 +44,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) (*cidutil.StreamingSet, error) {
+	set := cidutil.NewStreamingSet()
 
 	go func() {
 		ctx, cancel := context.WithCancel(ctx)

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