Skip to content

Commit

Permalink
bump: go-libipfs
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorropo committed Mar 20, 2023
1 parent b975593 commit 7c46f21
Show file tree
Hide file tree
Showing 95 changed files with 308 additions and 842 deletions.
4 changes: 2 additions & 2 deletions assets/assets.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/ipfs/kubo/core/coreapi"

cid "github.com/ipfs/go-cid"
options "github.com/ipfs/go-libipfs/coreiface/options"
"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-libipfs/files"
options "github.com/ipfs/interface-go-ipfs-core/options"
"github.com/ipfs/interface-go-ipfs-core/path"
)

//go:embed init-doc
Expand Down
4 changes: 2 additions & 2 deletions blocks/blockstoreutil/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"

cid "github.com/ipfs/go-cid"
bs "github.com/ipfs/go-ipfs-blockstore"
pin "github.com/ipfs/go-ipfs-pinner"
format "github.com/ipfs/go-ipld-format"
bs "github.com/ipfs/go-libipfs/blockstore"
pin "github.com/ipfs/go-libipfs/pinning/pinner"
)

// RemovedBlock is used to represent the result of removing a block.
Expand Down
6 changes: 3 additions & 3 deletions cmd/ipfs/add_migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"os"
"path/filepath"

coreiface "github.com/ipfs/go-libipfs/coreiface"
"github.com/ipfs/go-libipfs/coreiface/options"
ipath "github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-libipfs/files"
coreiface "github.com/ipfs/interface-go-ipfs-core"
"github.com/ipfs/interface-go-ipfs-core/options"
ipath "github.com/ipfs/interface-go-ipfs-core/path"
"github.com/ipfs/kubo/core"
"github.com/ipfs/kubo/core/coreapi"
"github.com/ipfs/kubo/repo/fsrepo/migrations"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
sockets "github.com/libp2p/go-socket-activation"

cmds "github.com/ipfs/go-ipfs-cmds"
options "github.com/ipfs/go-libipfs/coreiface/options"
mprome "github.com/ipfs/go-metrics-prometheus"
options "github.com/ipfs/interface-go-ipfs-core/options"
goprocess "github.com/jbenet/goprocess"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr/net"
Expand Down
6 changes: 3 additions & 3 deletions cmd/ipfs/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import (
"path/filepath"
"strings"

path "github.com/ipfs/go-path"
unixfs "github.com/ipfs/go-unixfs"
path "github.com/ipfs/go-libipfs/path"
unixfs "github.com/ipfs/go-libipfs/unixfs"
assets "github.com/ipfs/kubo/assets"
oldcmds "github.com/ipfs/kubo/commands"
core "github.com/ipfs/kubo/core"
"github.com/ipfs/kubo/core/commands"
fsrepo "github.com/ipfs/kubo/repo/fsrepo"

cmds "github.com/ipfs/go-ipfs-cmds"
options "github.com/ipfs/go-libipfs/coreiface/options"
"github.com/ipfs/go-libipfs/files"
options "github.com/ipfs/interface-go-ipfs-core/options"
config "github.com/ipfs/kubo/config"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
cmds "github.com/ipfs/go-ipfs-cmds"
"github.com/ipfs/go-ipfs-cmds/cli"
cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
u "github.com/ipfs/go-ipfs-util"
u "github.com/ipfs/go-libipfs/util"
logging "github.com/ipfs/go-log"
ma "github.com/multiformats/go-multiaddr"
madns "github.com/multiformats/go-multiaddr-dns"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/pinmfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

cid "github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"
pinclient "github.com/ipfs/go-libipfs/pinning/remote/client"
logging "github.com/ipfs/go-log"
pinclient "github.com/ipfs/go-pinning-service-http-client"

config "github.com/ipfs/kubo/config"
"github.com/ipfs/kubo/core"
Expand Down
4 changes: 2 additions & 2 deletions commands/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
loader "github.com/ipfs/kubo/plugin/loader"

cmds "github.com/ipfs/go-ipfs-cmds"
coreiface "github.com/ipfs/go-libipfs/coreiface"
options "github.com/ipfs/go-libipfs/coreiface/options"
logging "github.com/ipfs/go-log"
coreiface "github.com/ipfs/interface-go-ipfs-core"
options "github.com/ipfs/interface-go-ipfs-core/options"
config "github.com/ipfs/kubo/config"
)

Expand Down
2 changes: 1 addition & 1 deletion config/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"time"

"github.com/ipfs/interface-go-ipfs-core/options"
"github.com/ipfs/go-libipfs/coreiface/options"
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/peer"
)
Expand Down
2 changes: 1 addition & 1 deletion config/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

"github.com/ipfs/interface-go-ipfs-core/options"
"github.com/ipfs/go-libipfs/coreiface/options"
crypto_pb "github.com/libp2p/go-libp2p/core/crypto/pb"
)

Expand Down
6 changes: 3 additions & 3 deletions core/commands/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/cheggaaa/pb"
cmds "github.com/ipfs/go-ipfs-cmds"
ipld "github.com/ipfs/go-ipld-format"
coreiface "github.com/ipfs/go-libipfs/coreiface"
"github.com/ipfs/go-libipfs/coreiface/options"
"github.com/ipfs/go-libipfs/files"
mfs "github.com/ipfs/go-mfs"
coreiface "github.com/ipfs/interface-go-ipfs-core"
"github.com/ipfs/interface-go-ipfs-core/options"
mfs "github.com/ipfs/go-libipfs/mfs"
mh "github.com/multiformats/go-multihash"
)

Expand Down
4 changes: 2 additions & 2 deletions core/commands/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/ipfs/kubo/core/commands/cmdutils"

cmds "github.com/ipfs/go-ipfs-cmds"
options "github.com/ipfs/interface-go-ipfs-core/options"
path "github.com/ipfs/interface-go-ipfs-core/path"
options "github.com/ipfs/go-libipfs/coreiface/options"
path "github.com/ipfs/go-libipfs/coreiface/path"
mh "github.com/multiformats/go-multihash"
)

Expand Down
4 changes: 2 additions & 2 deletions core/commands/cat.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/cheggaaa/pb"
cmds "github.com/ipfs/go-ipfs-cmds"
iface "github.com/ipfs/go-libipfs/coreiface"
"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-libipfs/files"
iface "github.com/ipfs/interface-go-ipfs-core"
"github.com/ipfs/interface-go-ipfs-core/path"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cid.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
cid "github.com/ipfs/go-cid"
cidutil "github.com/ipfs/go-cidutil"
cmds "github.com/ipfs/go-ipfs-cmds"
verifcid "github.com/ipfs/go-verifcid"
verifcid "github.com/ipfs/go-libipfs/verifcid"
ipldmulticodec "github.com/ipld/go-ipld-prime/multicodec"
mbase "github.com/multiformats/go-multibase"
mc "github.com/multiformats/go-multicodec"
Expand Down
4 changes: 2 additions & 2 deletions core/commands/cmdenv/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/ipfs/kubo/core"

cmds "github.com/ipfs/go-ipfs-cmds"
coreiface "github.com/ipfs/go-libipfs/coreiface"
options "github.com/ipfs/go-libipfs/coreiface/options"
logging "github.com/ipfs/go-log"
coreiface "github.com/ipfs/interface-go-ipfs-core"
options "github.com/ipfs/interface-go-ipfs-core/options"
)

var log = logging.Logger("core/commands/cmdenv")
Expand Down
2 changes: 1 addition & 1 deletion core/commands/cmdutils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
cmds "github.com/ipfs/go-ipfs-cmds"

"github.com/ipfs/go-cid"
coreiface "github.com/ipfs/interface-go-ipfs-core"
coreiface "github.com/ipfs/go-libipfs/coreiface"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/dag.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
cid "github.com/ipfs/go-cid"
cidenc "github.com/ipfs/go-cidutil/cidenc"
cmds "github.com/ipfs/go-ipfs-cmds"
ipfspath "github.com/ipfs/go-path"
ipfspath "github.com/ipfs/go-libipfs/path"
//gipfree "github.com/ipld/go-ipld-prime/impl/free"
//gipselector "github.com/ipld/go-ipld-prime/traversal/selector"
//gipselectorbuilder "github.com/ipld/go-ipld-prime/traversal/selector/builder"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
cid "github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"
blocks "github.com/ipfs/go-libipfs/blocks"
iface "github.com/ipfs/interface-go-ipfs-core"
iface "github.com/ipfs/go-libipfs/coreiface"
"github.com/ipfs/kubo/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"

ipldlegacy "github.com/ipfs/go-ipld-legacy"
"github.com/ipfs/interface-go-ipfs-core/path"
"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/kubo/core/commands/cmdenv"

"github.com/ipld/go-ipld-prime"
Expand Down
4 changes: 2 additions & 2 deletions core/commands/dag/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
cid "github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"
ipldlegacy "github.com/ipfs/go-ipld-legacy"
iface "github.com/ipfs/go-libipfs/coreiface"
"github.com/ipfs/go-libipfs/coreiface/options"
"github.com/ipfs/go-libipfs/files"
iface "github.com/ipfs/interface-go-ipfs-core"
"github.com/ipfs/interface-go-ipfs-core/options"
"github.com/ipfs/kubo/core/commands/cmdenv"
"github.com/ipfs/kubo/core/commands/cmdutils"

Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/resolve.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dagcmd

import (
"github.com/ipfs/interface-go-ipfs-core/path"
"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/kubo/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dag/stat.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"
"os"

"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-merkledag/traverse"
"github.com/ipfs/interface-go-ipfs-core/path"
"github.com/ipfs/kubo/core/commands/cmdenv"
"github.com/ipfs/kubo/core/commands/e"

Expand Down
4 changes: 2 additions & 2 deletions core/commands/dht_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package commands
import (
"testing"

"github.com/ipfs/go-namesys"
"github.com/ipfs/go-libipfs/namesys"

ipns "github.com/ipfs/go-ipns"
ipns "github.com/ipfs/go-libipfs/ipns"
"github.com/libp2p/go-libp2p/core/test"
)

Expand Down
4 changes: 2 additions & 2 deletions core/commands/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"io"

namesys "github.com/ipfs/go-namesys"
nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
nsopts "github.com/ipfs/go-libipfs/coreiface/options/namesys"
namesys "github.com/ipfs/go-libipfs/namesys"
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
ncmd "github.com/ipfs/kubo/core/commands/name"

Expand Down
12 changes: 6 additions & 6 deletions core/commands/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ import (
"github.com/ipfs/kubo/core"
"github.com/ipfs/kubo/core/commands/cmdenv"

bservice "github.com/ipfs/go-blockservice"
cid "github.com/ipfs/go-cid"
cidenc "github.com/ipfs/go-cidutil/cidenc"
cmds "github.com/ipfs/go-ipfs-cmds"
offline "github.com/ipfs/go-ipfs-exchange-offline"
ipld "github.com/ipfs/go-ipld-format"
bservice "github.com/ipfs/go-libipfs/blockservice"
iface "github.com/ipfs/go-libipfs/coreiface"
path "github.com/ipfs/go-libipfs/coreiface/path"
offline "github.com/ipfs/go-libipfs/exchange/offline"
mfs "github.com/ipfs/go-libipfs/mfs"
ft "github.com/ipfs/go-libipfs/unixfs"
logging "github.com/ipfs/go-log"
dag "github.com/ipfs/go-merkledag"
mfs "github.com/ipfs/go-mfs"
ft "github.com/ipfs/go-unixfs"
iface "github.com/ipfs/interface-go-ipfs-core"
path "github.com/ipfs/interface-go-ipfs-core/path"
mh "github.com/multiformats/go-multihash"
)

Expand Down
2 changes: 1 addition & 1 deletion core/commands/filestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"os"

filestore "github.com/ipfs/go-filestore"
cmds "github.com/ipfs/go-ipfs-cmds"
filestore "github.com/ipfs/go-libipfs/filestore"
core "github.com/ipfs/kubo/core"
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
e "github.com/ipfs/kubo/core/commands/e"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (

"github.com/cheggaaa/pb"
cmds "github.com/ipfs/go-ipfs-cmds"
"github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-libipfs/files"
"github.com/ipfs/go-libipfs/tar"
"github.com/ipfs/interface-go-ipfs-core/path"
)

var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9")
Expand Down
4 changes: 2 additions & 2 deletions core/commands/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"text/tabwriter"

cmds "github.com/ipfs/go-ipfs-cmds"
keystore "github.com/ipfs/go-ipfs-keystore"
options "github.com/ipfs/interface-go-ipfs-core/options"
options "github.com/ipfs/go-libipfs/coreiface/options"
keystore "github.com/ipfs/go-libipfs/keystore"
oldcmds "github.com/ipfs/kubo/commands"
config "github.com/ipfs/kubo/config"
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
Expand Down
10 changes: 5 additions & 5 deletions core/commands/ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
unixfs "github.com/ipfs/go-unixfs"
unixfs_pb "github.com/ipfs/go-unixfs/pb"
iface "github.com/ipfs/interface-go-ipfs-core"
options "github.com/ipfs/interface-go-ipfs-core/options"
path "github.com/ipfs/interface-go-ipfs-core/path"
iface "github.com/ipfs/go-libipfs/coreiface"
options "github.com/ipfs/go-libipfs/coreiface/options"
path "github.com/ipfs/go-libipfs/coreiface/path"
unixfs "github.com/ipfs/go-libipfs/unixfs"
unixfs_pb "github.com/ipfs/go-libipfs/unixfs/pb"
)

// LsLink contains printable data for a single ipld link in ls output
Expand Down
8 changes: 4 additions & 4 deletions core/commands/name/ipns.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"strings"
"time"

namesys "github.com/ipfs/go-namesys"
namesys "github.com/ipfs/go-libipfs/namesys"
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
options "github.com/ipfs/go-libipfs/coreiface/options"
nsopts "github.com/ipfs/go-libipfs/coreiface/options/namesys"
path "github.com/ipfs/go-libipfs/path"
logging "github.com/ipfs/go-log"
path "github.com/ipfs/go-path"
options "github.com/ipfs/interface-go-ipfs-core/options"
nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
)

var log = logging.Logger("core/commands/ipns")
Expand Down
4 changes: 2 additions & 2 deletions core/commands/name/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/gogo/protobuf/proto"
cmds "github.com/ipfs/go-ipfs-cmds"
"github.com/ipfs/go-ipns"
ipns_pb "github.com/ipfs/go-ipns/pb"
"github.com/ipfs/go-libipfs/ipns"
ipns_pb "github.com/ipfs/go-libipfs/ipns/pb"
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
"github.com/ipld/go-ipld-prime"
"github.com/ipld/go-ipld-prime/codec/dagcbor"
Expand Down
6 changes: 3 additions & 3 deletions core/commands/name/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
iface "github.com/ipfs/interface-go-ipfs-core"
options "github.com/ipfs/interface-go-ipfs-core/options"
path "github.com/ipfs/interface-go-ipfs-core/path"
iface "github.com/ipfs/go-libipfs/coreiface"
options "github.com/ipfs/go-libipfs/coreiface/options"
path "github.com/ipfs/go-libipfs/coreiface/path"
ke "github.com/ipfs/kubo/core/commands/keyencode"
peer "github.com/libp2p/go-libp2p/core/peer"
)
Expand Down
2 changes: 1 addition & 1 deletion core/commands/object/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"

cmds "github.com/ipfs/go-ipfs-cmds"
path "github.com/ipfs/go-libipfs/coreiface/path"
"github.com/ipfs/go-merkledag/dagutils"
path "github.com/ipfs/interface-go-ipfs-core/path"

cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
)
Expand Down
Loading

0 comments on commit 7c46f21

Please sign in to comment.