From c8d1d63a7e0c0eca4b3064fa174e18ed5e2f5d84 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 2 Jun 2021 09:26:35 -0700 Subject: [PATCH] fix staticcheck --- hamt/hamt_test.go | 21 +++++++++++++++++++++ io/directory.go | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/hamt/hamt_test.go b/hamt/hamt_test.go index 4d2f64b22..8d0b93889 100644 --- a/hamt/hamt_test.go +++ b/hamt/hamt_test.go @@ -280,6 +280,9 @@ func TestRemoveAfterMarshal(t *testing.T) { } s, err = NewHamtFromDag(ds, nd) + if err != nil { + t.Fatal(err) + } ctx := context.Background() @@ -334,7 +337,13 @@ func TestSetAfterMarshal(t *testing.T) { } nd, err = nds.Node() + if err != nil { + t.Fatal(err) + } nds, err = NewHamtFromDag(ds, nd) + if err != nil { + t.Fatal(err) + } links, err := nds.EnumLinks(ctx) if err != nil { @@ -408,7 +417,13 @@ func TestDuplicateAddShard(t *testing.T) { } node, err := dir.Node() + if err != nil { + t.Fatal(err) + } dir, err = NewHamtFromDag(ds, node) + if err != nil { + t.Fatal(err) + } lnks, err := dir.EnumLinks(ctx) if err != nil { @@ -503,7 +518,13 @@ func TestRemoveElemsAfterMarshal(t *testing.T) { } nd, err = nds.Node() + if err != nil { + t.Fatal(err) + } nds, err = NewHamtFromDag(ds, nd) + if err != nil { + t.Fatal(err) + } links, err := nds.EnumLinks(ctx) if err != nil { diff --git a/io/directory.go b/io/directory.go index 4163b80d6..15c7e862a 100644 --- a/io/directory.go +++ b/io/directory.go @@ -8,9 +8,9 @@ import ( mdag "github.com/ipfs/go-merkledag" format "github.com/ipfs/go-unixfs" - hamt "github.com/ipfs/go-unixfs/hamt" + "github.com/ipfs/go-unixfs/hamt" - cid "github.com/ipfs/go-cid" + "github.com/ipfs/go-cid" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" ) @@ -151,7 +151,7 @@ func NewDirectoryFromNode(dserv ipld.DAGService, node ipld.Node) (Directory, err func (d *BasicDirectory) computeEstimatedSize() { d.estimatedSize = 0 - d.ForEachLink(nil, func(l *ipld.Link) error { + d.ForEachLink(context.TODO(), func(l *ipld.Link) error { d.addToEstimatedSize(l.Name, l.Cid) return nil })