Skip to content

Commit 1a8e71b

Browse files
authored
Merge pull request #20 from ipfs/feat/update-deps
Update deps for ADL selectors
2 parents 7397bdd + 72ac065 commit 1a8e71b

File tree

5 files changed

+611
-126
lines changed

5 files changed

+611
-126
lines changed

Diff for: data/builder/directory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func estimateDirSize(entries []dagpb.PBLink) int {
8989
// BuildUnixFSDirectory creates a directory link over a collection of entries.
9090
func BuildUnixFSDirectory(entries []dagpb.PBLink, ls *ipld.LinkSystem) (ipld.Link, error) {
9191
if estimateDirSize(entries) > shardSplitThreshold {
92-
return BuildUnixFSShardedDirectory(defaultShardWidth, multihash.MURMUR3_128, entries, ls)
92+
return BuildUnixFSShardedDirectory(defaultShardWidth, multihash.MURMUR3X64_64, entries, ls)
9393
}
9494
ufd, err := BuildUnixFS(func(b *Builder) {
9595
DataType(b, data.Data_Directory)

Diff for: file/file_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ func open(car string, t *testing.T) (ipld.Node, *ipld.LinkSystem) {
6767
t.Fatal(err)
6868
}
6969
ls := cidlink.DefaultLinkSystem()
70-
ls.StorageReadOpener = func(_ ipld.LinkContext, l ipld.Link) (io.Reader, error) {
70+
ls.StorageReadOpener = func(lctx ipld.LinkContext, l ipld.Link) (io.Reader, error) {
7171
cl, ok := l.(cidlink.Link)
7272
if !ok {
7373
return nil, fmt.Errorf("couldn't load link")
7474
}
75-
blk, err := baseStore.Get(cl.Cid)
75+
blk, err := baseStore.Get(lctx.Ctx, cl.Cid)
7676
if err != nil {
7777
return nil, err
7878
}

Diff for: go.mod

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ require (
66
github.com/Stebalien/go-bitfield v0.0.1
77
github.com/ipfs/go-bitfield v1.0.0
88
github.com/ipfs/go-cid v0.1.0
9-
github.com/ipfs/go-datastore v0.4.6 // indirect
109
github.com/ipfs/go-ipfs-chunker v0.0.1
1110
github.com/ipfs/go-ipfs-util v0.0.2
1211
github.com/ipfs/go-ipld-format v0.2.0
13-
github.com/ipfs/go-merkledag v0.3.2
14-
github.com/ipfs/go-unixfs v0.2.4
15-
github.com/ipld/go-car/v2 v2.1.0
12+
github.com/ipfs/go-merkledag v0.5.1
13+
github.com/ipfs/go-unixfs v0.3.1
14+
github.com/ipld/go-car/v2 v2.1.1
1615
github.com/ipld/go-codec-dagpb v1.3.0
17-
github.com/ipld/go-ipld-prime v0.12.4-0.20211014180653-3ba656a3bc6b
18-
github.com/multiformats/go-multicodec v0.3.1-0.20210902112759-1539a079fd61
19-
github.com/multiformats/go-multihash v0.0.17-0.20211012170226-654b06d7912a
16+
github.com/ipld/go-ipld-prime v0.14.4
17+
github.com/multiformats/go-multicodec v0.3.1-0.20211210143421-a526f306ed2c
18+
github.com/multiformats/go-multihash v0.1.0
2019
github.com/spaolacci/murmur3 v1.1.0
2120
github.com/stretchr/testify v1.7.0
2221
google.golang.org/protobuf v1.27.1

0 commit comments

Comments
 (0)