Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade ipfs deps #102

Closed
wants to merge 1 commit into from
Closed

chore: upgrade ipfs deps #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion entry/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"encoding/json"
"sort"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
core_iface "github.com/ipfs/interface-go-ipfs-core"
"github.com/multiformats/go-multibase"

"berty.tech/go-ipfs-log/errmsg"
Expand Down
2 changes: 1 addition & 1 deletion entry/entry_io.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package entry // import "berty.tech/go-ipfs-log/entry"
import (
"context"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
core_iface "github.com/ipfs/interface-go-ipfs-core"

"berty.tech/go-ipfs-log/iface"
)
Expand Down
2 changes: 1 addition & 1 deletion entry/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"berty.tech/go-ipfs-log/identityprovider"
"berty.tech/go-ipfs-log/iface"
"berty.tech/go-ipfs-log/io/cbor"
core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
core_iface "github.com/ipfs/interface-go-ipfs-core"
"golang.org/x/sync/semaphore"
)

Expand Down
2 changes: 1 addition & 1 deletion example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ require (
github.com/ipfs/go-unixfs v0.4.4 // indirect
github.com/ipfs/go-unixfsnode v1.5.2 // indirect
github.com/ipfs/go-verifcid v0.0.2 // indirect
github.com/ipfs/interface-go-ipfs-core v0.11.1 // indirect
github.com/ipfs/boxo/coreiface v0.11.1 // indirect
github.com/ipld/edelweiss v0.2.0 // indirect
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
github.com/ipld/go-ipld-prime v0.20.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions example/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,8 +604,8 @@ github.com/ipfs/go-unixfsnode v1.5.2/go.mod h1:NlOebRwYx8lMCNMdhAhEspYPBD3obp7TE
github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs=
github.com/ipfs/go-verifcid v0.0.2/go.mod h1:40cD9x1y4OWnFXbLNJYRe7MpNvWlMn3LZAG5Wb4xnPU=
github.com/ipfs/interface-go-ipfs-core v0.11.1 h1:xVW8DKzd230h8bPv+oC2fBjW4PtDGqGtvpX64/aBe48=
github.com/ipfs/interface-go-ipfs-core v0.11.1/go.mod h1:xmnoccUXY7N/Q8AIx0vFqgW926/FAZ8+do/1NTEHKsU=
github.com/ipfs/boxo/coreiface v0.11.1 h1:xVW8DKzd230h8bPv+oC2fBjW4PtDGqGtvpX64/aBe48=
github.com/ipfs/boxo/coreiface v0.11.1/go.mod h1:xmnoccUXY7N/Q8AIx0vFqgW926/FAZ8+do/1NTEHKsU=
github.com/ipfs/kubo v0.19.0 h1:5B58RXikTqs9six7FweQSzo6WvBKiP2MVwYCvJomV7k=
github.com/ipfs/kubo v0.19.0/go.mod h1:OqX4B1YWKWCvi9T/sKDfTBMAKbVi6yVIXAii6/nr1Dc=
github.com/ipld/edelweiss v0.2.0 h1:KfAZBP8eeJtrLxLhi7r3N0cBCo7JmwSRhOJp3WSpNjk=
Expand Down
202 changes: 105 additions & 97 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

1,082 changes: 264 additions & 818 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion iface/iface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
format "github.com/ipfs/go-ipld-format"
core_iface "github.com/ipfs/interface-go-ipfs-core"

"berty.tech/go-ipfs-log/accesscontroller"
"berty.tech/go-ipfs-log/identityprovider"
Expand Down
6 changes: 3 additions & 3 deletions io/cbor/cbor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"berty.tech/go-ipfs-log/enc"
"github.com/ipfs/go-ipld-cbor/encoding"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/boxo/path"
"github.com/ipfs/go-cid"
cbornode "github.com/ipfs/go-ipld-cbor"
format "github.com/ipfs/go-ipld-format"
core_iface "github.com/ipfs/interface-go-ipfs-core"
"github.com/ipfs/interface-go-ipfs-core/path"
ic "github.com/libp2p/go-libp2p/core/crypto"
"github.com/polydawn/refmt/obj/atlas"

Expand Down Expand Up @@ -261,7 +261,7 @@ func (i *IOCbor) Write(ctx context.Context, ipfs core_iface.CoreAPI, obj interfa
}

if opts.Pin {
if err = ipfs.Pin().Add(ctx, path.IpfsPath(cborNode.Cid())); err != nil {
if err = ipfs.Pin().Add(ctx, path.FromCid(cborNode.Cid())); err != nil {
return cid.Undef, errmsg.ErrIPFSOperationFailed.Wrap(err)
}
}
Expand Down
2 changes: 1 addition & 1 deletion io/compatibility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"berty.tech/go-ipfs-log/entry"
"berty.tech/go-ipfs-log/iface"
"berty.tech/go-ipfs-log/io/cbor"
core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
format "github.com/ipfs/go-ipld-format"
core_iface "github.com/ipfs/interface-go-ipfs-core"
)

type CBOROptions = cbor.Options
Expand Down
2 changes: 1 addition & 1 deletion io/pb/pb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"encoding/json"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
format "github.com/ipfs/go-ipld-format"
dag "github.com/ipfs/go-merkledag"
core_iface "github.com/ipfs/interface-go-ipfs-core"

"berty.tech/go-ipfs-log/errmsg"
idp "berty.tech/go-ipfs-log/identityprovider"
Expand Down
2 changes: 1 addition & 1 deletion log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"sync"
"time"

core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-cid"
core_iface "github.com/ipfs/interface-go-ipfs-core"

"berty.tech/go-ipfs-log/accesscontroller"
"berty.tech/go-ipfs-log/entry"
Expand Down Expand Up @@ -622,7 +622,7 @@
return entry.NewOrderedMap()
}

if logB.Entries == nil {

Check failure on line 625 in log.go

View workflow job for this annotation

GitHub Actions / GolangCI-lint (1.19.x) 

invalid operation: cannot compare logB.Entries == nil (operator == not defined on untyped nil) (typecheck)
logB.Entries = entry.NewOrderedMap()
}

Expand Down
2 changes: 1 addition & 1 deletion log_io.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"fmt"
"time"

core_iface "github.com/ipfs/interface-go-ipfs-core"
core_iface "github.com/ipfs/boxo/coreiface"

"berty.tech/go-ipfs-log/iface"

Expand Down Expand Up @@ -49,7 +49,7 @@

// Use user provided sorting function or the default one
sortFn := sorting.NoZeroes(sorting.LastWriteWins)
if options.SortFn != nil {

Check failure on line 52 in log_io.go

View workflow job for this annotation

GitHub Actions / GolangCI-lint (1.19.x) 

invalid operation: cannot compare options.SortFn != nil (operator != not defined on untyped nil) (typecheck)
sortFn = options.SortFn
}

Expand Down Expand Up @@ -111,7 +111,7 @@
})

sortFn := sorting.NoZeroes(sorting.LastWriteWins)
if options.SortFn != nil {

Check failure on line 114 in log_io.go

View workflow job for this annotation

GitHub Actions / GolangCI-lint (1.19.x) 

invalid operation: cannot compare options.SortFn != nil (operator != not defined on untyped nil) (typecheck)
sortFn = options.SortFn
}

Expand Down
2 changes: 1 addition & 1 deletion test/utils_logcreator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

ipfslog "berty.tech/go-ipfs-log"
idp "berty.tech/go-ipfs-log/identityprovider"
core_iface "github.com/ipfs/interface-go-ipfs-core"
core_iface "github.com/ipfs/boxo/coreiface"
)

type CreatedLog struct {
Expand Down
2 changes: 1 addition & 1 deletion test/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"berty.tech/go-ipfs-log/iface"
core_iface "github.com/ipfs/boxo/coreiface"
"github.com/ipfs/go-datastore"
dssync "github.com/ipfs/go-datastore/sync"
core_iface "github.com/ipfs/interface-go-ipfs-core"
config "github.com/ipfs/kubo/config"
ipfsCore "github.com/ipfs/kubo/core"
"github.com/ipfs/kubo/core/coreapi"
Expand Down
Loading