Commit 8c4e1b3f authored by Steven Allen's avatar Steven Allen

fix: update go-merkledag to use new Walk function

parent fd890ab9
...@@ -5,19 +5,19 @@ go 1.12 ...@@ -5,19 +5,19 @@ go 1.12
require ( require (
github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50 // indirect github.com/btcsuite/btcd v0.0.0-20190605094302-a0d1e3e36d50 // indirect
github.com/cenkalti/backoff v2.1.1+incompatible github.com/cenkalti/backoff v2.1.1+incompatible
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ipfs/go-block-format v0.0.2 github.com/ipfs/go-block-format v0.0.2
github.com/ipfs/go-cid v0.0.2 github.com/ipfs/go-cid v0.0.2
github.com/ipfs/go-cidutil v0.0.2
github.com/ipfs/go-datastore v0.0.5 github.com/ipfs/go-datastore v0.0.5
github.com/ipfs/go-ipfs-blockstore v0.0.1 github.com/ipfs/go-ipfs-blockstore v0.0.1
github.com/ipfs/go-ipfs-blocksutil v0.0.1 github.com/ipfs/go-ipfs-blocksutil v0.0.1
github.com/ipfs/go-ipfs-routing v0.1.0 github.com/ipfs/go-ipfs-routing v0.1.0
github.com/ipfs/go-ipld-format v0.0.2
github.com/ipfs/go-log v0.0.1 github.com/ipfs/go-log v0.0.1
github.com/ipfs/go-merkledag v0.2.0
github.com/ipfs/go-verifcid v0.0.1 github.com/ipfs/go-verifcid v0.0.1
github.com/libp2p/go-libp2p-core v0.0.3 github.com/libp2p/go-libp2p-core v0.0.3
github.com/libp2p/go-libp2p-testing v0.0.4 github.com/libp2p/go-libp2p-testing v0.0.4
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect
golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae // indirect golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae // indirect
) )
This diff is collapsed.
...@@ -213,10 +213,8 @@ func pinSet(ctx context.Context, pinning Pinner, dag ipld.DAGService, onlyRoots ...@@ -213,10 +213,8 @@ func pinSet(ctx context.Context, pinning Pinner, dag ipld.DAGService, onlyRoots
} }
for _, key := range pinning.RecursiveKeys() { for _, key := range pinning.RecursiveKeys() {
set.Visitor(ctx)(key)
if !onlyRoots { if !onlyRoots {
err := merkledag.EnumerateChildren(ctx, merkledag.GetLinksWithDAG(dag), key, set.Visitor(ctx)) err := merkledag.Walk(ctx, merkledag.GetLinksWithDAG(dag), key, set.Visitor(ctx))
if err != nil { if err != nil {
logR.Errorf("reprovide indirect pins: %s", err) logR.Errorf("reprovide indirect pins: %s", err)
return return
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment