Merge pull request #20 from ipfs/feat/update-deps

Update deps for ADL selectors
ipfs · Jan 13, 2022 · 1a8e71b · 1a8e71b
2 parents 7397bdd + 72ac065
commit 1a8e71b
Show file tree

Hide file tree

Showing 5 changed files with 611 additions and 126 deletions.
diff --git a/data/builder/directory.go b/data/builder/directory.go
@@ -89,7 +89,7 @@ func estimateDirSize(entries []dagpb.PBLink) int {
 // BuildUnixFSDirectory creates a directory link over a collection of entries.
 func BuildUnixFSDirectory(entries []dagpb.PBLink, ls *ipld.LinkSystem) (ipld.Link, error) {
  if estimateDirSize(entries) > shardSplitThreshold {
- return BuildUnixFSShardedDirectory(defaultShardWidth, multihash.MURMUR3_128, entries, ls)
+ return BuildUnixFSShardedDirectory(defaultShardWidth, multihash.MURMUR3X64_64, entries, ls)
  }
  ufd, err := BuildUnixFS(func(b *Builder) {
  DataType(b, data.Data_Directory)

diff --git a/file/file_test.go b/file/file_test.go
@@ -67,12 +67,12 @@ func open(car string, t *testing.T) (ipld.Node, *ipld.LinkSystem) {
  t.Fatal(err)
  }
  ls := cidlink.DefaultLinkSystem()
- ls.StorageReadOpener = func(_ ipld.LinkContext, l ipld.Link) (io.Reader, error) {
+ ls.StorageReadOpener = func(lctx ipld.LinkContext, l ipld.Link) (io.Reader, error) {
  cl, ok := l.(cidlink.Link)
  if !ok {
  return nil, fmt.Errorf("couldn't load link")
  }
- blk, err := baseStore.Get(cl.Cid)
+ blk, err := baseStore.Get(lctx.Ctx, cl.Cid)
  if err != nil {
  return nil, err
  }

diff --git a/go.mod b/go.mod
@@ -6,17 +6,16 @@ require (
  github.com/Stebalien/go-bitfield v0.0.1
  github.com/ipfs/go-bitfield v1.0.0
  github.com/ipfs/go-cid v0.1.0
- github.com/ipfs/go-datastore v0.4.6 // indirect
  github.com/ipfs/go-ipfs-chunker v0.0.1
  github.com/ipfs/go-ipfs-util v0.0.2
  github.com/ipfs/go-ipld-format v0.2.0
- github.com/ipfs/go-merkledag v0.3.2
- github.com/ipfs/go-unixfs v0.2.4
- github.com/ipld/go-car/v2 v2.1.0
+ github.com/ipfs/go-merkledag v0.5.1
+ github.com/ipfs/go-unixfs v0.3.1
+ github.com/ipld/go-car/v2 v2.1.1
  github.com/ipld/go-codec-dagpb v1.3.0
- github.com/ipld/go-ipld-prime v0.12.4-0.20211014180653-3ba656a3bc6b
- github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61
- github.com/multiformats/go-multihash v0.0.17-0.20211012170226-654b06d7912a
+ github.com/ipld/go-ipld-prime v0.14.4
+ github.com/multiformats/go-multicodec v0.3.1-0.20211210143421-a526f306ed2c
+ github.com/multiformats/go-multihash v0.1.0
  github.com/spaolacci/murmur3 v1.1.0
  github.com/stretchr/testify v1.7.0
  google.golang.org/protobuf v1.27.1