From 4a8aa37bb20645ae88878ac826b23610dedccd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Wed, 24 Jul 2019 12:21:59 +0200 Subject: [PATCH] update the the last go-merkledag --- go.mod | 2 +- go.sum | 2 ++ hamt/hamt.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2cdc5839..64e01ba9b 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/ipfs/go-ipfs-posinfo v0.0.1 github.com/ipfs/go-ipfs-util v0.0.1 github.com/ipfs/go-ipld-format v0.0.2 - github.com/ipfs/go-merkledag v0.2.0 + github.com/ipfs/go-merkledag v0.2.1 github.com/multiformats/go-multihash v0.0.5 github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14 // indirect github.com/smartystreets/assertions v1.0.0 // indirect diff --git a/go.sum b/go.sum index f8aee2de2..68990de4d 100644 --- a/go.sum +++ b/go.sum @@ -116,6 +116,8 @@ github.com/ipfs/go-log v0.0.1 h1:9XTUN/rW64BCG1YhPK9Hoy3q8nr4gOmHHBpgFdfw6Lc= github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM= github.com/ipfs/go-merkledag v0.2.0 h1:EAjIQCgZ6/DnOAlKY3+59j72FD9BsYtNaCRSmN0xIbU= github.com/ipfs/go-merkledag v0.2.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk= +github.com/ipfs/go-merkledag v0.2.1 h1:rHJeuK6+cRzvY4uA9QMPFq9t6I2DKV0oeaKNecnoeeg= +github.com/ipfs/go-merkledag v0.2.1/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk= github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg= github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY= github.com/ipfs/go-peertaskqueue v0.1.0 h1:bpRbgv76eT4avutNPDFZuCPOQus6qTgurEYxfulgZW4= diff --git a/hamt/hamt.go b/hamt/hamt.go index c44b1789f..ef2885f88 100644 --- a/hamt/hamt.go +++ b/hamt/hamt.go @@ -330,7 +330,7 @@ func (ds *Shard) ForEachLink(ctx context.Context, f func(*ipld.Link) error) erro } // EnumLinksAsync returns a channel which will receive Links in the directory -// as they are enumerated, where order is not gauranteed +// as they are enumerated, where order is not guaranteed func (ds *Shard) EnumLinksAsync(ctx context.Context) <-chan format.LinkResult { linkResults := make(chan format.LinkResult) ctx, cancel := context.WithCancel(ctx) @@ -339,7 +339,7 @@ func (ds *Shard) EnumLinksAsync(ctx context.Context) <-chan format.LinkResult { defer cancel() getLinks := makeAsyncTrieGetLinks(ds.dserv, linkResults) cset := cid.NewSet() - err := dag.WalkParallel(ctx, getLinks, ds.cid, cset.Visit) + err := dag.Walk(ctx, getLinks, ds.cid, cset.Visit, dag.Concurrent(), dag.WithRoot()) if err != nil { emitResult(ctx, linkResults, format.LinkResult{Link: nil, Err: err}) }