@cryptotaxi247 / kubo / commits / 58c29399c

chore: clean migration

Henrique Dias committed Nov 29, 2023 at 10:40 UTC 58c29399cf83d12a1d997ce44ec5ac6a696301dc
90 files changed +137 -133
assets/assets.go
+1 -1
@@ -8,10 +8,10 @@ import (
8 "github.com/ipfs/kubo/core"
9 "github.com/ipfs/kubo/core/coreapi"
10
11 - options "github.com/ipfs/boxo/coreiface/options"
11 "github.com/ipfs/boxo/files"
12 "github.com/ipfs/boxo/path"
13 cid "github.com/ipfs/go-cid"
14 + options "github.com/ipfs/kubo/core/coreiface/options"
15 )
16
17 //go:embed init-doc
client/rpc/api.go
+2 -2
@@ -13,12 +13,12 @@ import (
13 "time"
14
15 "github.com/blang/semver/v4"
16 - iface "github.com/ipfs/boxo/coreiface"
17 - caopts "github.com/ipfs/boxo/coreiface/options"
16 "github.com/ipfs/boxo/ipld/merkledag"
17 "github.com/ipfs/go-cid"
18 legacy "github.com/ipfs/go-ipld-legacy"
19 ipfs "github.com/ipfs/kubo"
20 + iface "github.com/ipfs/kubo/core/coreiface"
21 + caopts "github.com/ipfs/kubo/core/coreiface/options"
22 dagpb "github.com/ipld/go-codec-dagpb"
23 _ "github.com/ipld/go-ipld-prime/codec/dagcbor"
24 "github.com/ipld/go-ipld-prime/node/basicnode"
client/rpc/api_test.go
+2 -2
@@ -11,9 +11,9 @@ import (
11 "testing"
12 "time"
13
14 - iface "github.com/ipfs/boxo/coreiface"
15 - "github.com/ipfs/boxo/coreiface/tests"
14 "github.com/ipfs/boxo/path"
15 + iface "github.com/ipfs/kubo/core/coreiface"
16 + "github.com/ipfs/kubo/core/coreiface/tests"
17 "github.com/ipfs/kubo/test/cli/harness"
18 ma "github.com/multiformats/go-multiaddr"
19 "go.uber.org/multierr"
client/rpc/block.go
+2 -2
@@ -6,10 +6,10 @@ import (
6 "fmt"
7 "io"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/path"
10 "github.com/ipfs/go-cid"
11 + iface "github.com/ipfs/kubo/core/coreiface"
12 + caopts "github.com/ipfs/kubo/core/coreiface/options"
13 mc "github.com/multiformats/go-multicodec"
14 mh "github.com/multiformats/go-multihash"
15 )
client/rpc/dag.go
+1 -1
@@ -6,11 +6,11 @@ import (
6 "fmt"
7 "io"
8
9 - "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/path"
10 blocks "github.com/ipfs/go-block-format"
11 "github.com/ipfs/go-cid"
12 format "github.com/ipfs/go-ipld-format"
13 + "github.com/ipfs/kubo/core/coreiface/options"
14 multicodec "github.com/multiformats/go-multicodec"
15 )
16
client/rpc/dht.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "context"
5 "encoding/json"
6
7 - caopts "github.com/ipfs/boxo/coreiface/options"
7 "github.com/ipfs/boxo/path"
8 + caopts "github.com/ipfs/kubo/core/coreiface/options"
9 "github.com/libp2p/go-libp2p/core/peer"
10 "github.com/libp2p/go-libp2p/core/routing"
11 )
client/rpc/key.go
+2 -2
@@ -4,10 +4,10 @@ import (
4 "context"
5 "errors"
6
7 - iface "github.com/ipfs/boxo/coreiface"
8 - caopts "github.com/ipfs/boxo/coreiface/options"
7 "github.com/ipfs/boxo/ipns"
8 "github.com/ipfs/boxo/path"
9 + iface "github.com/ipfs/kubo/core/coreiface"
10 + caopts "github.com/ipfs/kubo/core/coreiface/options"
11 "github.com/libp2p/go-libp2p/core/peer"
12 )
13
client/rpc/name.go
+2 -2
@@ -6,11 +6,11 @@ import (
6 "fmt"
7 "io"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/ipns"
10 "github.com/ipfs/boxo/namesys"
11 "github.com/ipfs/boxo/path"
12 + iface "github.com/ipfs/kubo/core/coreiface"
13 + caopts "github.com/ipfs/kubo/core/coreiface/options"
14 )
15
16 type NameAPI HttpApi
client/rpc/object.go
+2 -2
@@ -6,13 +6,13 @@ import (
6 "fmt"
7 "io"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/ipld/merkledag"
10 ft "github.com/ipfs/boxo/ipld/unixfs"
11 "github.com/ipfs/boxo/path"
12 "github.com/ipfs/go-cid"
13 ipld "github.com/ipfs/go-ipld-format"
14 + iface "github.com/ipfs/kubo/core/coreiface"
15 + caopts "github.com/ipfs/kubo/core/coreiface/options"
16 )
17
18 type ObjectAPI HttpApi
client/rpc/pin.go
+2 -2
@@ -6,10 +6,10 @@ import (
6 "io"
7 "strings"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/path"
10 "github.com/ipfs/go-cid"
11 + iface "github.com/ipfs/kubo/core/coreiface"
12 + caopts "github.com/ipfs/kubo/core/coreiface/options"
13 "github.com/pkg/errors"
14 )
15
client/rpc/pubsub.go
+2 -2
@@ -6,8 +6,8 @@ import (
6 "encoding/json"
7 "io"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 + iface "github.com/ipfs/kubo/core/coreiface"
10 + caopts "github.com/ipfs/kubo/core/coreiface/options"
11 "github.com/libp2p/go-libp2p/core/peer"
12 mbase "github.com/multiformats/go-multibase"
13 )
client/rpc/routing.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "encoding/base64"
7 "encoding/json"
8
9 - "github.com/ipfs/boxo/coreiface/options"
9 + "github.com/ipfs/kubo/core/coreiface/options"
10 "github.com/libp2p/go-libp2p/core/routing"
11 )
12
client/rpc/swarm.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "context"
5 "time"
6
7 - iface "github.com/ipfs/boxo/coreiface"
7 + iface "github.com/ipfs/kubo/core/coreiface"
8 "github.com/libp2p/go-libp2p/core/network"
9 "github.com/libp2p/go-libp2p/core/peer"
10 "github.com/libp2p/go-libp2p/core/protocol"
client/rpc/unixfs.go
+2 -2
@@ -7,13 +7,13 @@ import (
7 "fmt"
8 "io"
9
10 - iface "github.com/ipfs/boxo/coreiface"
11 - caopts "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/files"
11 unixfs "github.com/ipfs/boxo/ipld/unixfs"
12 unixfs_pb "github.com/ipfs/boxo/ipld/unixfs/pb"
13 "github.com/ipfs/boxo/path"
14 "github.com/ipfs/go-cid"
15 + iface "github.com/ipfs/kubo/core/coreiface"
16 + caopts "github.com/ipfs/kubo/core/coreiface/options"
17 mh "github.com/multiformats/go-multihash"
18 )
19
cmd/ipfs/add_migrations.go
+2 -2
@@ -8,12 +8,12 @@ import (
8 "os"
9 "path/filepath"
10
11 - coreiface "github.com/ipfs/boxo/coreiface"
12 - "github.com/ipfs/boxo/coreiface/options"
11 "github.com/ipfs/boxo/files"
12 "github.com/ipfs/boxo/path"
13 "github.com/ipfs/kubo/core"
14 "github.com/ipfs/kubo/core/coreapi"
15 + coreiface "github.com/ipfs/kubo/core/coreiface"
16 + "github.com/ipfs/kubo/core/coreiface/options"
17 "github.com/ipfs/kubo/repo/fsrepo/migrations"
18 "github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
19 "github.com/libp2p/go-libp2p/core/peer"
cmd/ipfs/daemon.go
+1 -1
@@ -15,7 +15,6 @@ import (
15
16 multierror "github.com/hashicorp/go-multierror"
17
18 - options "github.com/ipfs/boxo/coreiface/options"
18 cmds "github.com/ipfs/go-ipfs-cmds"
19 mprome "github.com/ipfs/go-metrics-prometheus"
20 version "github.com/ipfs/kubo"
@@ -27,6 +26,7 @@ import (
26 commands "github.com/ipfs/kubo/core/commands"
27 "github.com/ipfs/kubo/core/coreapi"
28 corehttp "github.com/ipfs/kubo/core/corehttp"
29 + options "github.com/ipfs/kubo/core/coreiface/options"
30 corerepo "github.com/ipfs/kubo/core/corerepo"
31 libp2p "github.com/ipfs/kubo/core/node/libp2p"
32 nodeMount "github.com/ipfs/kubo/fuse/node"
cmd/ipfs/init.go
+1 -1
@@ -18,10 +18,10 @@ import (
18 "github.com/ipfs/kubo/core/commands"
19 fsrepo "github.com/ipfs/kubo/repo/fsrepo"
20
21 - options "github.com/ipfs/boxo/coreiface/options"
21 "github.com/ipfs/boxo/files"
22 cmds "github.com/ipfs/go-ipfs-cmds"
23 config "github.com/ipfs/kubo/config"
24 + options "github.com/ipfs/kubo/core/coreiface/options"
25 )
26
27 const (
commands/context.go
+2 -2
@@ -10,11 +10,11 @@ import (
10 coreapi "github.com/ipfs/kubo/core/coreapi"
11 loader "github.com/ipfs/kubo/plugin/loader"
12
13 - coreiface "github.com/ipfs/boxo/coreiface"
14 - options "github.com/ipfs/boxo/coreiface/options"
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 logging "github.com/ipfs/go-log"
15 config "github.com/ipfs/kubo/config"
16 + coreiface "github.com/ipfs/kubo/core/coreiface"
17 + options "github.com/ipfs/kubo/core/coreiface/options"
18 )
19
20 var log = logging.Logger("command")
config/init.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "io"
8 "time"
9
10 - "github.com/ipfs/boxo/coreiface/options"
10 + "github.com/ipfs/kubo/core/coreiface/options"
11 "github.com/libp2p/go-libp2p/core/crypto"
12 "github.com/libp2p/go-libp2p/core/peer"
13 )
config/init_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "bytes"
5 "testing"
6
7 - "github.com/ipfs/boxo/coreiface/options"
7 + "github.com/ipfs/kubo/core/coreiface/options"
8 crypto_pb "github.com/libp2p/go-libp2p/core/crypto/pb"
9 )
10
core/commands/add.go
+2 -2
@@ -11,13 +11,13 @@ import (
11 "github.com/ipfs/kubo/core/commands/cmdenv"
12
13 "github.com/cheggaaa/pb"
14 - coreiface "github.com/ipfs/boxo/coreiface"
15 - "github.com/ipfs/boxo/coreiface/options"
14 "github.com/ipfs/boxo/files"
15 mfs "github.com/ipfs/boxo/mfs"
16 "github.com/ipfs/boxo/path"
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 ipld "github.com/ipfs/go-ipld-format"
19 + coreiface "github.com/ipfs/kubo/core/coreiface"
20 + "github.com/ipfs/kubo/core/coreiface/options"
21 mh "github.com/multiformats/go-multihash"
22 )
23
core/commands/block.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
12 "github.com/ipfs/kubo/core/commands/cmdutils"
13
14 - options "github.com/ipfs/boxo/coreiface/options"
14 + options "github.com/ipfs/kubo/core/coreiface/options"
15
16 cmds "github.com/ipfs/go-ipfs-cmds"
17 mh "github.com/multiformats/go-multihash"
core/commands/cat.go
+1 -1
@@ -10,9 +10,9 @@ import (
10 "github.com/ipfs/kubo/core/commands/cmdutils"
11
12 "github.com/cheggaaa/pb"
13 - iface "github.com/ipfs/boxo/coreiface"
13 "github.com/ipfs/boxo/files"
14 cmds "github.com/ipfs/go-ipfs-cmds"
15 + iface "github.com/ipfs/kubo/core/coreiface"
16 )
17
18 const (
core/commands/cmdenv/env.go
+2 -2
@@ -8,10 +8,10 @@ import (
8 "github.com/ipfs/kubo/commands"
9 "github.com/ipfs/kubo/core"
10
11 - coreiface "github.com/ipfs/boxo/coreiface"
12 - options "github.com/ipfs/boxo/coreiface/options"
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 logging "github.com/ipfs/go-log"
13 + coreiface "github.com/ipfs/kubo/core/coreiface"
14 + options "github.com/ipfs/kubo/core/coreiface/options"
15 )
16
17 var log = logging.Logger("core/commands/cmdenv")
core/commands/cmdutils/utils.go
+1 -1
@@ -5,9 +5,9 @@ import (
5
6 cmds "github.com/ipfs/go-ipfs-cmds"
7
8 - coreiface "github.com/ipfs/boxo/coreiface"
8 "github.com/ipfs/boxo/path"
9 "github.com/ipfs/go-cid"
10 + coreiface "github.com/ipfs/kubo/core/coreiface"
11 )
12
13 const (
core/commands/dag/export.go
+1 -1
@@ -9,12 +9,12 @@ import (
9 "time"
10
11 "github.com/cheggaaa/pb"
12 - iface "github.com/ipfs/boxo/coreiface"
12 blocks "github.com/ipfs/go-block-format"
13 cid "github.com/ipfs/go-cid"
14 ipld "github.com/ipfs/go-ipld-format"
15 "github.com/ipfs/kubo/core/commands/cmdenv"
16 "github.com/ipfs/kubo/core/commands/cmdutils"
17 + iface "github.com/ipfs/kubo/core/coreiface"
18
19 cmds "github.com/ipfs/go-ipfs-cmds"
20 gocar "github.com/ipld/go-car"
core/commands/dag/import.go
+1 -1
@@ -5,13 +5,13 @@ import (
5 "fmt"
6 "io"
7
8 - "github.com/ipfs/boxo/coreiface/options"
8 "github.com/ipfs/boxo/files"
9 blocks "github.com/ipfs/go-block-format"
10 cid "github.com/ipfs/go-cid"
11 cmds "github.com/ipfs/go-ipfs-cmds"
12 ipld "github.com/ipfs/go-ipld-format"
13 ipldlegacy "github.com/ipfs/go-ipld-legacy"
14 + "github.com/ipfs/kubo/core/coreiface/options"
15 gocarv2 "github.com/ipld/go-car/v2"
16
17 "github.com/ipfs/kubo/core/commands/cmdenv"
core/commands/files.go
+1 -1
@@ -15,7 +15,6 @@ import (
15 "github.com/ipfs/kubo/core/commands/cmdenv"
16
17 bservice "github.com/ipfs/boxo/blockservice"
18 - iface "github.com/ipfs/boxo/coreiface"
18 offline "github.com/ipfs/boxo/exchange/offline"
19 dag "github.com/ipfs/boxo/ipld/merkledag"
20 ft "github.com/ipfs/boxo/ipld/unixfs"
@@ -26,6 +25,7 @@ import (
25 cmds "github.com/ipfs/go-ipfs-cmds"
26 ipld "github.com/ipfs/go-ipld-format"
27 logging "github.com/ipfs/go-log"
28 + iface "github.com/ipfs/kubo/core/coreiface"
29 mh "github.com/multiformats/go-multihash"
30 )
31
core/commands/keystore.go
+1 -1
@@ -12,7 +12,6 @@ import (
12 "strings"
13 "text/tabwriter"
14
15 - options "github.com/ipfs/boxo/coreiface/options"
15 keystore "github.com/ipfs/boxo/keystore"
16 cmds "github.com/ipfs/go-ipfs-cmds"
17 oldcmds "github.com/ipfs/kubo/commands"
@@ -20,6 +19,7 @@ import (
19 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
20 "github.com/ipfs/kubo/core/commands/e"
21 ke "github.com/ipfs/kubo/core/commands/keyencode"
22 + options "github.com/ipfs/kubo/core/coreiface/options"
23 fsrepo "github.com/ipfs/kubo/repo/fsrepo"
24 migrations "github.com/ipfs/kubo/repo/fsrepo/migrations"
25 "github.com/libp2p/go-libp2p/core/crypto"
core/commands/ls.go
+2 -2
@@ -10,11 +10,11 @@ import (
10 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11 "github.com/ipfs/kubo/core/commands/cmdutils"
12
13 - iface "github.com/ipfs/boxo/coreiface"
14 - options "github.com/ipfs/boxo/coreiface/options"
13 unixfs "github.com/ipfs/boxo/ipld/unixfs"
14 unixfs_pb "github.com/ipfs/boxo/ipld/unixfs/pb"
15 cmds "github.com/ipfs/go-ipfs-cmds"
16 + iface "github.com/ipfs/kubo/core/coreiface"
17 + options "github.com/ipfs/kubo/core/coreiface/options"
18 )
19
20 // LsLink contains printable data for a single ipld link in ls output
core/commands/name/ipns.go
+1 -1
@@ -7,12 +7,12 @@ import (
7 "strings"
8 "time"
9
10 - options "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/namesys"
11 "github.com/ipfs/boxo/path"
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 logging "github.com/ipfs/go-log"
14 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
15 + options "github.com/ipfs/kubo/core/coreiface/options"
16 )
17
18 var log = logging.Logger("core/commands/ipns")
core/commands/name/publish.go
+2 -2
@@ -9,11 +9,11 @@ import (
9 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10 "github.com/ipfs/kubo/core/commands/cmdutils"
11
12 - iface "github.com/ipfs/boxo/coreiface"
13 - options "github.com/ipfs/boxo/coreiface/options"
12 ipns "github.com/ipfs/boxo/ipns"
13 cmds "github.com/ipfs/go-ipfs-cmds"
14 ke "github.com/ipfs/kubo/core/commands/keyencode"
15 + iface "github.com/ipfs/kubo/core/coreiface"
16 + options "github.com/ipfs/kubo/core/coreiface/options"
17 )
18
19 var errAllowOffline = errors.New("can't publish while offline: pass `--allow-offline` to override")
core/commands/object/object.go
+1 -1
@@ -12,10 +12,10 @@ import (
12 "github.com/ipfs/kubo/core/commands/cmdutils"
13
14 humanize "github.com/dustin/go-humanize"
15 - "github.com/ipfs/boxo/coreiface/options"
15 dag "github.com/ipfs/boxo/ipld/merkledag"
16 "github.com/ipfs/go-cid"
17 ipld "github.com/ipfs/go-ipld-format"
18 + "github.com/ipfs/kubo/core/coreiface/options"
19 )
20
21 type Node struct {
core/commands/object/patch.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "github.com/ipfs/kubo/core/commands/cmdenv"
9 "github.com/ipfs/kubo/core/commands/cmdutils"
10
11 - "github.com/ipfs/boxo/coreiface/options"
11 + "github.com/ipfs/kubo/core/coreiface/options"
12 )
13
14 var ObjectPatchCmd = &cmds.Command{
core/commands/pin/pin.go
+2 -2
@@ -9,14 +9,14 @@ import (
9 "time"
10
11 bserv "github.com/ipfs/boxo/blockservice"
12 - coreiface "github.com/ipfs/boxo/coreiface"
13 - options "github.com/ipfs/boxo/coreiface/options"
12 offline "github.com/ipfs/boxo/exchange/offline"
13 dag "github.com/ipfs/boxo/ipld/merkledag"
14 verifcid "github.com/ipfs/boxo/verifcid"
15 cid "github.com/ipfs/go-cid"
16 cidenc "github.com/ipfs/go-cidutil/cidenc"
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 + coreiface "github.com/ipfs/kubo/core/coreiface"
19 + options "github.com/ipfs/kubo/core/coreiface/options"
20
21 core "github.com/ipfs/kubo/core"
22 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
core/commands/pubsub.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 mbase "github.com/multiformats/go-multibase"
12 "github.com/pkg/errors"
13
14 - options "github.com/ipfs/boxo/coreiface/options"
14 cmds "github.com/ipfs/go-ipfs-cmds"
15 + options "github.com/ipfs/kubo/core/coreiface/options"
16 )
17
18 var PubsubCmd = &cmds.Command{
core/commands/refs.go
+1 -1
@@ -10,12 +10,12 @@ import (
10 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
11 "github.com/ipfs/kubo/core/commands/cmdutils"
12
13 - iface "github.com/ipfs/boxo/coreiface"
13 merkledag "github.com/ipfs/boxo/ipld/merkledag"
14 cid "github.com/ipfs/go-cid"
15 cidenc "github.com/ipfs/go-cidutil/cidenc"
16 cmds "github.com/ipfs/go-ipfs-cmds"
17 ipld "github.com/ipfs/go-ipld-format"
18 + iface "github.com/ipfs/kubo/core/coreiface"
19 )
20
21 var refsEncoderMap = cmds.EncoderMap{
core/commands/resolve.go
+1 -1
@@ -13,9 +13,9 @@ import (
13 "github.com/ipfs/kubo/core/commands/cmdutils"
14 ncmd "github.com/ipfs/kubo/core/commands/name"
15
16 - options "github.com/ipfs/boxo/coreiface/options"
16 "github.com/ipfs/boxo/path"
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 + options "github.com/ipfs/kubo/core/coreiface/options"
19 )
20
21 const (
core/commands/routing.go
+2 -2
@@ -11,13 +11,13 @@ import (
11
12 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
13
14 - iface "github.com/ipfs/boxo/coreiface"
15 - "github.com/ipfs/boxo/coreiface/options"
14 dag "github.com/ipfs/boxo/ipld/merkledag"
15 "github.com/ipfs/boxo/ipns"
16 cid "github.com/ipfs/go-cid"
17 cmds "github.com/ipfs/go-ipfs-cmds"
18 ipld "github.com/ipfs/go-ipld-format"
19 + iface "github.com/ipfs/kubo/core/coreiface"
20 + "github.com/ipfs/kubo/core/coreiface/options"
21 peer "github.com/libp2p/go-libp2p/core/peer"
22 routing "github.com/libp2p/go-libp2p/core/routing"
23 )
core/commands/urlstore.go
+1 -1
@@ -8,9 +8,9 @@ import (
8 filestore "github.com/ipfs/boxo/filestore"
9 cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
10
11 - "github.com/ipfs/boxo/coreiface/options"
11 "github.com/ipfs/boxo/files"
12 cmds "github.com/ipfs/go-ipfs-cmds"
13 + "github.com/ipfs/kubo/core/coreiface/options"
14 )
15
16 var urlStoreCmd = &cmds.Command{
core/coreapi/block.go
+2 -2
@@ -6,12 +6,12 @@ import (
6 "errors"
7 "io"
8
9 - coreiface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/path"
10 pin "github.com/ipfs/boxo/pinning/pinner"
11 blocks "github.com/ipfs/go-block-format"
12 cid "github.com/ipfs/go-cid"
13 + coreiface "github.com/ipfs/kubo/core/coreiface"
14 + caopts "github.com/ipfs/kubo/core/coreiface/options"
15 "go.opentelemetry.io/otel/attribute"
16 "go.opentelemetry.io/otel/trace"
17
core/coreapi/coreapi.go
+2 -2
@@ -17,8 +17,6 @@ import (
17
18 bserv "github.com/ipfs/boxo/blockservice"
19 blockstore "github.com/ipfs/boxo/blockstore"
20 - coreiface "github.com/ipfs/boxo/coreiface"
21 - "github.com/ipfs/boxo/coreiface/options"
20 exchange "github.com/ipfs/boxo/exchange"
21 offlinexch "github.com/ipfs/boxo/exchange/offline"
22 "github.com/ipfs/boxo/fetcher"
@@ -28,6 +26,8 @@ import (
26 provider "github.com/ipfs/boxo/provider"
27 offlineroute "github.com/ipfs/boxo/routing/offline"
28 ipld "github.com/ipfs/go-ipld-format"
29 + coreiface "github.com/ipfs/kubo/core/coreiface"
30 + "github.com/ipfs/kubo/core/coreiface/options"
31 pubsub "github.com/libp2p/go-libp2p-pubsub"
32 record "github.com/libp2p/go-libp2p-record"
33 ci "github.com/libp2p/go-libp2p/core/crypto"
core/coreapi/dht.go
+2 -2
@@ -6,13 +6,13 @@ import (
6
7 blockservice "github.com/ipfs/boxo/blockservice"
8 blockstore "github.com/ipfs/boxo/blockstore"
9 - coreiface "github.com/ipfs/boxo/coreiface"
10 - caopts "github.com/ipfs/boxo/coreiface/options"
9 offline "github.com/ipfs/boxo/exchange/offline"
10 dag "github.com/ipfs/boxo/ipld/merkledag"
11 "github.com/ipfs/boxo/path"
12 cid "github.com/ipfs/go-cid"
13 cidutil "github.com/ipfs/go-cidutil"
14 + coreiface "github.com/ipfs/kubo/core/coreiface"
15 + caopts "github.com/ipfs/kubo/core/coreiface/options"
16 "github.com/ipfs/kubo/tracing"
17 peer "github.com/libp2p/go-libp2p/core/peer"
18 routing "github.com/libp2p/go-libp2p/core/routing"
core/coreapi/key.go
+2 -2
@@ -7,10 +7,10 @@ import (
7 "fmt"
8 "sort"
9
10 - coreiface "github.com/ipfs/boxo/coreiface"
11 - caopts "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/ipns"
11 "github.com/ipfs/boxo/path"
12 + coreiface "github.com/ipfs/kubo/core/coreiface"
13 + caopts "github.com/ipfs/kubo/core/coreiface/options"
14 "github.com/ipfs/kubo/tracing"
15 crypto "github.com/libp2p/go-libp2p/core/crypto"
16 peer "github.com/libp2p/go-libp2p/core/peer"
core/coreapi/name.go
+2 -2
@@ -13,9 +13,9 @@ import (
13 "go.opentelemetry.io/otel/attribute"
14 "go.opentelemetry.io/otel/trace"
15
16 - coreiface "github.com/ipfs/boxo/coreiface"
17 - caopts "github.com/ipfs/boxo/coreiface/options"
16 "github.com/ipfs/boxo/path"
17 + coreiface "github.com/ipfs/kubo/core/coreiface"
18 + caopts "github.com/ipfs/kubo/core/coreiface/options"
19 ci "github.com/libp2p/go-libp2p/core/crypto"
20 peer "github.com/libp2p/go-libp2p/core/peer"
21 )
core/coreapi/object.go
+2 -2
@@ -10,8 +10,6 @@ import (
10 "fmt"
11 "io"
12
13 - coreiface "github.com/ipfs/boxo/coreiface"
14 - caopts "github.com/ipfs/boxo/coreiface/options"
13 dag "github.com/ipfs/boxo/ipld/merkledag"
14 "github.com/ipfs/boxo/ipld/merkledag/dagutils"
15 ft "github.com/ipfs/boxo/ipld/unixfs"
@@ -19,6 +17,8 @@ import (
17 pin "github.com/ipfs/boxo/pinning/pinner"
18 cid "github.com/ipfs/go-cid"
19 ipld "github.com/ipfs/go-ipld-format"
20 + coreiface "github.com/ipfs/kubo/core/coreiface"
21 + caopts "github.com/ipfs/kubo/core/coreiface/options"
22 "go.opentelemetry.io/otel/attribute"
23 "go.opentelemetry.io/otel/trace"
24
core/coreapi/path.go
+1 -1
@@ -11,10 +11,10 @@ import (
11 "go.opentelemetry.io/otel/attribute"
12 "go.opentelemetry.io/otel/trace"
13
14 - coreiface "github.com/ipfs/boxo/coreiface"
14 "github.com/ipfs/boxo/path"
15 ipfspathresolver "github.com/ipfs/boxo/path/resolver"
16 ipld "github.com/ipfs/go-ipld-format"
17 + coreiface "github.com/ipfs/kubo/core/coreiface"
18 )
19
20 // ResolveNode resolves the path `p` using Unixfs resolver, gets and returns the
core/coreapi/pin.go
+2 -2
@@ -5,13 +5,13 @@ import (
5 "fmt"
6
7 bserv "github.com/ipfs/boxo/blockservice"
8 - coreiface "github.com/ipfs/boxo/coreiface"
9 - caopts "github.com/ipfs/boxo/coreiface/options"
8 offline "github.com/ipfs/boxo/exchange/offline"
9 "github.com/ipfs/boxo/ipld/merkledag"
10 "github.com/ipfs/boxo/path"
11 pin "github.com/ipfs/boxo/pinning/pinner"
12 "github.com/ipfs/go-cid"
13 + coreiface "github.com/ipfs/kubo/core/coreiface"
14 + caopts "github.com/ipfs/kubo/core/coreiface/options"
15 "go.opentelemetry.io/otel/attribute"
16 "go.opentelemetry.io/otel/trace"
17
core/coreapi/pubsub.go
+2 -2
@@ -4,8 +4,8 @@ import (
4 "context"
5 "errors"
6
7 - coreiface "github.com/ipfs/boxo/coreiface"
8 - caopts "github.com/ipfs/boxo/coreiface/options"
7 + coreiface "github.com/ipfs/kubo/core/coreiface"
8 + caopts "github.com/ipfs/kubo/core/coreiface/options"
9 "github.com/ipfs/kubo/tracing"
10 pubsub "github.com/libp2p/go-libp2p-pubsub"
11 peer "github.com/libp2p/go-libp2p/core/peer"
core/coreapi/routing.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 "errors"
6 "strings"
7
8 - coreiface "github.com/ipfs/boxo/coreiface"
9 - caopts "github.com/ipfs/boxo/coreiface/options"
8 + coreiface "github.com/ipfs/kubo/core/coreiface"
9 + caopts "github.com/ipfs/kubo/core/coreiface/options"
10 peer "github.com/libp2p/go-libp2p/core/peer"
11 )
12
core/coreapi/swarm.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "sort"
6 "time"
7
8 - coreiface "github.com/ipfs/boxo/coreiface"
8 + coreiface "github.com/ipfs/kubo/core/coreiface"
9 "github.com/ipfs/kubo/tracing"
10 inet "github.com/libp2p/go-libp2p/core/network"
11 "github.com/libp2p/go-libp2p/core/peer"
core/coreapi/test/api_test.go
+2 -2
@@ -17,11 +17,11 @@ import (
17 "github.com/ipfs/kubo/core/node/libp2p"
18 "github.com/ipfs/kubo/repo"
19
20 - coreiface "github.com/ipfs/boxo/coreiface"
21 - "github.com/ipfs/boxo/coreiface/tests"
20 "github.com/ipfs/go-datastore"
21 syncds "github.com/ipfs/go-datastore/sync"
22 "github.com/ipfs/kubo/config"
23 + coreiface "github.com/ipfs/kubo/core/coreiface"
24 + "github.com/ipfs/kubo/core/coreiface/tests"
25 "github.com/libp2p/go-libp2p/core/crypto"
26 "github.com/libp2p/go-libp2p/core/peer"
27 mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
core/coreapi/test/path_test.go
+1 -1
@@ -6,11 +6,11 @@ import (
6 "testing"
7 "time"
8
9 - "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/files"
10 "github.com/ipfs/boxo/ipld/merkledag"
11 uio "github.com/ipfs/boxo/ipld/unixfs/io"
12 "github.com/ipfs/boxo/path"
13 + "github.com/ipfs/kubo/core/coreiface/options"
14 "github.com/ipld/go-ipld-prime"
15 )
16
core/coreapi/unixfs.go
+2 -2
@@ -14,8 +14,6 @@ import (
14
15 blockservice "github.com/ipfs/boxo/blockservice"
16 bstore "github.com/ipfs/boxo/blockstore"
17 - coreiface "github.com/ipfs/boxo/coreiface"
18 - options "github.com/ipfs/boxo/coreiface/options"
17 "github.com/ipfs/boxo/files"
18 filestore "github.com/ipfs/boxo/filestore"
19 merkledag "github.com/ipfs/boxo/ipld/merkledag"
@@ -28,6 +26,8 @@ import (
26 cid "github.com/ipfs/go-cid"
27 cidutil "github.com/ipfs/go-cidutil"
28 ipld "github.com/ipfs/go-ipld-format"
29 + coreiface "github.com/ipfs/kubo/core/coreiface"
30 + options "github.com/ipfs/kubo/core/coreiface/options"
31 )
32
33 type UnixfsAPI CoreAPI
core/corehttp/gateway.go
+1 -1
@@ -10,7 +10,6 @@ import (
10 "time"
11
12 "github.com/ipfs/boxo/blockservice"
13 - iface "github.com/ipfs/boxo/coreiface"
13 "github.com/ipfs/boxo/exchange/offline"
14 "github.com/ipfs/boxo/files"
15 "github.com/ipfs/boxo/gateway"
@@ -21,6 +20,7 @@ import (
20 version "github.com/ipfs/kubo"
21 "github.com/ipfs/kubo/config"
22 "github.com/ipfs/kubo/core"
23 + iface "github.com/ipfs/kubo/core/coreiface"
24 "github.com/ipfs/kubo/core/node"
25 "github.com/libp2p/go-libp2p/core/routing"
26 "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
core/corehttp/gateway_test.go
+1 -1
@@ -16,11 +16,11 @@ import (
16 "github.com/ipfs/kubo/repo"
17 "github.com/stretchr/testify/assert"
18
19 - iface "github.com/ipfs/boxo/coreiface"
19 "github.com/ipfs/boxo/path"
20 "github.com/ipfs/go-datastore"
21 syncds "github.com/ipfs/go-datastore/sync"
22 "github.com/ipfs/kubo/config"
23 + iface "github.com/ipfs/kubo/core/coreiface"
24 ci "github.com/libp2p/go-libp2p/core/crypto"
25 )
26
core/coreiface/block.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "context"
5 "io"
6
7 - "github.com/ipfs/boxo/coreiface/options"
7 "github.com/ipfs/boxo/path"
8 + "github.com/ipfs/kubo/core/coreiface/options"
9 )
10
11 // BlockStat contains information about a block
core/coreiface/coreapi.go
+1 -1
@@ -5,8 +5,8 @@ package iface
5 import (
6 "context"
7
8 - "github.com/ipfs/boxo/coreiface/options"
8 "github.com/ipfs/boxo/path"
9 + "github.com/ipfs/kubo/core/coreiface/options"
10
11 ipld "github.com/ipfs/go-ipld-format"
12 )
core/coreiface/dht.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 "github.com/ipfs/boxo/path"
7
8 - "github.com/ipfs/boxo/coreiface/options"
8 + "github.com/ipfs/kubo/core/coreiface/options"
9
10 "github.com/libp2p/go-libp2p/core/peer"
11 )
core/coreiface/key.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 "github.com/ipfs/boxo/path"
7
8 - "github.com/ipfs/boxo/coreiface/options"
8 + "github.com/ipfs/kubo/core/coreiface/options"
9
10 "github.com/libp2p/go-libp2p/core/peer"
11 )
core/coreiface/name.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "context"
5 "errors"
6
7 - "github.com/ipfs/boxo/coreiface/options"
7 "github.com/ipfs/boxo/ipns"
8 "github.com/ipfs/boxo/path"
9 + "github.com/ipfs/kubo/core/coreiface/options"
10 )
11
12 var ErrResolveFailed = errors.New("could not resolve name")
core/coreiface/object.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "context"
5 "io"
6
7 - "github.com/ipfs/boxo/coreiface/options"
7 "github.com/ipfs/boxo/path"
8 + "github.com/ipfs/kubo/core/coreiface/options"
9
10 "github.com/ipfs/go-cid"
11 ipld "github.com/ipfs/go-ipld-format"
core/coreiface/pin.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 "github.com/ipfs/boxo/path"
7
8 - "github.com/ipfs/boxo/coreiface/options"
8 + "github.com/ipfs/kubo/core/coreiface/options"
9 )
10
11 // Pin holds information about pinned resource
core/coreiface/pubsub.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "context"
5 "io"
6
7 - "github.com/ipfs/boxo/coreiface/options"
7 + "github.com/ipfs/kubo/core/coreiface/options"
8
9 "github.com/libp2p/go-libp2p/core/peer"
10 )
core/coreiface/routing.go
+1 -1
@@ -3,7 +3,7 @@ package iface
3 import (
4 "context"
5
6 - "github.com/ipfs/boxo/coreiface/options"
6 + "github.com/ipfs/kubo/core/coreiface/options"
7 )
8
9 // RoutingAPI specifies the interface to the routing layer.
core/coreiface/tests/api.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "testing"
7 "time"
8
9 - coreiface "github.com/ipfs/boxo/coreiface"
9 + coreiface "github.com/ipfs/kubo/core/coreiface"
10 )
11
12 var errAPINotImplemented = errors.New("api not implemented")
core/coreiface/tests/block.go
+2 -2
@@ -7,10 +7,10 @@ import (
7 "strings"
8 "testing"
9
10 - coreiface "github.com/ipfs/boxo/coreiface"
11 - opt "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/path"
11 ipld "github.com/ipfs/go-ipld-format"
12 + coreiface "github.com/ipfs/kubo/core/coreiface"
13 + opt "github.com/ipfs/kubo/core/coreiface/options"
14 mh "github.com/multiformats/go-multihash"
15 )
16
core/coreiface/tests/dag.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "strings"
7 "testing"
8
9 - coreiface "github.com/ipfs/boxo/coreiface"
9 "github.com/ipfs/boxo/path"
10 + coreiface "github.com/ipfs/kubo/core/coreiface"
11
12 ipldcbor "github.com/ipfs/go-ipld-cbor"
13 ipld "github.com/ipfs/go-ipld-format"
core/coreiface/tests/dht.go
+2 -2
@@ -6,8 +6,8 @@ import (
6 "testing"
7 "time"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - "github.com/ipfs/boxo/coreiface/options"
9 + iface "github.com/ipfs/kubo/core/coreiface"
10 + "github.com/ipfs/kubo/core/coreiface/options"
11 )
12
13 func (tp *TestSuite) TestDht(t *testing.T) {
core/coreiface/tests/key.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "strings"
6 "testing"
7
8 - iface "github.com/ipfs/boxo/coreiface"
9 - opt "github.com/ipfs/boxo/coreiface/options"
8 "github.com/ipfs/go-cid"
9 + iface "github.com/ipfs/kubo/core/coreiface"
10 + opt "github.com/ipfs/kubo/core/coreiface/options"
11 mbase "github.com/multiformats/go-multibase"
12 )
13
core/coreiface/tests/name.go
+2 -2
@@ -7,11 +7,11 @@ import (
7 "testing"
8 "time"
9
10 - coreiface "github.com/ipfs/boxo/coreiface"
11 - opt "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/files"
11 "github.com/ipfs/boxo/ipns"
12 "github.com/ipfs/boxo/path"
13 + coreiface "github.com/ipfs/kubo/core/coreiface"
14 + opt "github.com/ipfs/kubo/core/coreiface/options"
15 "github.com/stretchr/testify/require"
16 )
17
core/coreiface/tests/object.go
+2 -2
@@ -8,8 +8,8 @@ import (
8 "strings"
9 "testing"
10
11 - iface "github.com/ipfs/boxo/coreiface"
12 - opt "github.com/ipfs/boxo/coreiface/options"
11 + iface "github.com/ipfs/kubo/core/coreiface"
12 + opt "github.com/ipfs/kubo/core/coreiface/options"
13 )
14
15 func (tp *TestSuite) TestObject(t *testing.T) {
core/coreiface/tests/path.go
+1 -1
@@ -7,10 +7,10 @@ import (
7 "strings"
8 "testing"
9
10 - "github.com/ipfs/boxo/coreiface/options"
10 "github.com/ipfs/boxo/path"
11 "github.com/ipfs/go-cid"
12 ipldcbor "github.com/ipfs/go-ipld-cbor"
13 + "github.com/ipfs/kubo/core/coreiface/options"
14 "github.com/stretchr/testify/require"
15 )
16
core/coreiface/tests/pin.go
+2 -2
@@ -6,12 +6,12 @@ import (
6 "strings"
7 "testing"
8
9 - iface "github.com/ipfs/boxo/coreiface"
10 - opt "github.com/ipfs/boxo/coreiface/options"
9 "github.com/ipfs/boxo/path"
10 "github.com/ipfs/go-cid"
11 ipldcbor "github.com/ipfs/go-ipld-cbor"
12 ipld "github.com/ipfs/go-ipld-format"
13 + iface "github.com/ipfs/kubo/core/coreiface"
14 + opt "github.com/ipfs/kubo/core/coreiface/options"
15 )
16
17 func (tp *TestSuite) TestPin(t *testing.T) {
core/coreiface/tests/pubsub.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 "testing"
6 "time"
7
8 - iface "github.com/ipfs/boxo/coreiface"
9 - "github.com/ipfs/boxo/coreiface/options"
8 + iface "github.com/ipfs/kubo/core/coreiface"
9 + "github.com/ipfs/kubo/core/coreiface/options"
10 )
11
12 func (tp *TestSuite) TestPubSub(t *testing.T) {
core/coreiface/tests/routing.go
+2 -2
@@ -5,10 +5,10 @@ import (
5 "testing"
6 "time"
7
8 - iface "github.com/ipfs/boxo/coreiface"
9 - "github.com/ipfs/boxo/coreiface/options"
8 "github.com/ipfs/boxo/ipns"
9 "github.com/ipfs/boxo/path"
10 + iface "github.com/ipfs/kubo/core/coreiface"
11 + "github.com/ipfs/kubo/core/coreiface/options"
12 "github.com/stretchr/testify/require"
13 )
14
core/coreiface/tests/unixfs.go
+2 -2
@@ -14,9 +14,9 @@ import (
14 "sync"
15 "testing"
16
17 - coreiface "github.com/ipfs/boxo/coreiface"
18 - "github.com/ipfs/boxo/coreiface/options"
17 "github.com/ipfs/boxo/path"
18 + coreiface "github.com/ipfs/kubo/core/coreiface"
19 + "github.com/ipfs/kubo/core/coreiface/options"
20
21 "github.com/ipfs/boxo/files"
22 mdag "github.com/ipfs/boxo/ipld/merkledag"
core/coreiface/unixfs.go
+1 -1
@@ -3,10 +3,10 @@ package iface
3 import (
4 "context"
5
6 - "github.com/ipfs/boxo/coreiface/options"
6 "github.com/ipfs/boxo/files"
7 "github.com/ipfs/boxo/path"
8 "github.com/ipfs/go-cid"
9 + "github.com/ipfs/kubo/core/coreiface/options"
10 )
11
12 type AddEvent struct {
core/coreunix/add.go
+1 -1
@@ -10,7 +10,6 @@ import (
10
11 bstore "github.com/ipfs/boxo/blockstore"
12 chunker "github.com/ipfs/boxo/chunker"
13 - coreiface "github.com/ipfs/boxo/coreiface"
13 "github.com/ipfs/boxo/files"
14 posinfo "github.com/ipfs/boxo/filestore/posinfo"
15 dag "github.com/ipfs/boxo/ipld/merkledag"
@@ -24,6 +23,7 @@ import (
23 "github.com/ipfs/go-cid"
24 ipld "github.com/ipfs/go-ipld-format"
25 logging "github.com/ipfs/go-log"
26 + coreiface "github.com/ipfs/kubo/core/coreiface"
27
28 "github.com/ipfs/kubo/tracing"
29 )
core/coreunix/add_test.go
+1 -1
@@ -16,7 +16,6 @@ import (
16
17 "github.com/ipfs/boxo/blockservice"
18 blockstore "github.com/ipfs/boxo/blockstore"
19 - coreiface "github.com/ipfs/boxo/coreiface"
19 "github.com/ipfs/boxo/files"
20 pi "github.com/ipfs/boxo/filestore/posinfo"
21 dag "github.com/ipfs/boxo/ipld/merkledag"
@@ -25,6 +24,7 @@ import (
24 "github.com/ipfs/go-datastore"
25 syncds "github.com/ipfs/go-datastore/sync"
26 config "github.com/ipfs/kubo/config"
27 + coreiface "github.com/ipfs/kubo/core/coreiface"
28 )
29
30 const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
docs/examples/kubo-as-a-library/go.mod
+1 -1
@@ -7,7 +7,7 @@ go 1.20
7 replace github.com/ipfs/kubo => ./../../..
8
9 require (
10 - github.com/ipfs/boxo v0.15.0
10 + github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86
11 github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
12 github.com/libp2p/go-libp2p v0.32.1
13 github.com/multiformats/go-multiaddr v0.12.0
docs/examples/kubo-as-a-library/go.sum
+2 -2
@@ -303,8 +303,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
303 github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
304 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
305 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
306 -github.com/ipfs/boxo v0.15.0 h1:BriLydj2nlK1nKeJQHxcKSuG5ZXcoutzhBklOtxC5pk=
307 -github.com/ipfs/boxo v0.15.0/go.mod h1:X5ulcbR5Nh7sm3Db8+08AApUo6FsGC5mb23QDKAoB/M=
306 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86 h1:9a7ug9Llglmdbzgj/gdKbPoZrd3EoaartzepObr/jlc=
307 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86/go.mod h1:jAgpNQn7T7BnibUeReXcKU9Ha1xmYNyOlwVEl193ow0=
308 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
309 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
310 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
docs/examples/kubo-as-a-library/main.go
+1 -1
@@ -11,9 +11,9 @@ import (
11 "strings"
12 "sync"
13
14 - icore "github.com/ipfs/boxo/coreiface"
14 "github.com/ipfs/boxo/files"
15 "github.com/ipfs/boxo/path"
16 + icore "github.com/ipfs/kubo/core/coreiface"
17 ma "github.com/multiformats/go-multiaddr"
18
19 "github.com/ipfs/kubo/config"
fuse/ipns/ipns_unix.go
+2 -2
@@ -20,11 +20,11 @@ import (
20
21 fuse "bazil.org/fuse"
22 fs "bazil.org/fuse/fs"
23 - iface "github.com/ipfs/boxo/coreiface"
24 - options "github.com/ipfs/boxo/coreiface/options"
23 mfs "github.com/ipfs/boxo/mfs"
24 cid "github.com/ipfs/go-cid"
25 logging "github.com/ipfs/go-log"
26 + iface "github.com/ipfs/kubo/core/coreiface"
27 + options "github.com/ipfs/kubo/core/coreiface/options"
28 )
29
30 func init() {
go.mod
+2 -2
@@ -17,7 +17,7 @@ require (
17 github.com/hashicorp/go-multierror v1.1.1
18 github.com/ipfs-shipyard/nopfs v0.0.12-0.20231027223058-cde3b5ba964c
19 github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c
20 - github.com/ipfs/boxo v0.15.0
20 + github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86
21 github.com/ipfs/go-block-format v0.2.0
22 github.com/ipfs/go-cid v0.4.1
23 github.com/ipfs/go-cidutil v0.1.0
@@ -29,6 +29,7 @@ require (
29 github.com/ipfs/go-ds-measure v0.2.0
30 github.com/ipfs/go-fs-lock v0.0.7
31 github.com/ipfs/go-ipfs-cmds v0.10.0
32 + github.com/ipfs/go-ipld-cbor v0.0.6
33 github.com/ipfs/go-ipld-format v0.6.0
34 github.com/ipfs/go-ipld-git v0.1.1
35 github.com/ipfs/go-ipld-legacy v0.2.1
@@ -141,7 +142,6 @@ require (
142 github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
143 github.com/ipfs/go-ipfs-redirects-file v0.1.1 // indirect
144 github.com/ipfs/go-ipfs-util v0.0.3 // indirect
144 - github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
145 github.com/ipfs/go-merkledag v0.11.0 // indirect
146 github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
147 github.com/ipfs/go-verifcid v0.0.2 // indirect
go.sum
+2 -2
@@ -337,8 +337,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
337 github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
338 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
339 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
340 -github.com/ipfs/boxo v0.15.0 h1:BriLydj2nlK1nKeJQHxcKSuG5ZXcoutzhBklOtxC5pk=
341 -github.com/ipfs/boxo v0.15.0/go.mod h1:X5ulcbR5Nh7sm3Db8+08AApUo6FsGC5mb23QDKAoB/M=
340 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86 h1:9a7ug9Llglmdbzgj/gdKbPoZrd3EoaartzepObr/jlc=
341 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86/go.mod h1:jAgpNQn7T7BnibUeReXcKU9Ha1xmYNyOlwVEl193ow0=
342 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
343 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
344 github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
plugin/daemon.go
+1 -1
@@ -1,7 +1,7 @@
1 package plugin
2
3 import (
4 - coreiface "github.com/ipfs/boxo/coreiface"
4 + coreiface "github.com/ipfs/kubo/core/coreiface"
5 )
6
7 // PluginDaemon is an interface for daemon plugins. These plugins will be run on
repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go
+2 -2
@@ -11,13 +11,13 @@ import (
11 "strings"
12 "sync"
13
14 - iface "github.com/ipfs/boxo/coreiface"
15 - "github.com/ipfs/boxo/coreiface/options"
14 "github.com/ipfs/boxo/files"
15 "github.com/ipfs/boxo/path"
16 "github.com/ipfs/kubo/config"
17 "github.com/ipfs/kubo/core"
18 "github.com/ipfs/kubo/core/coreapi"
19 + iface "github.com/ipfs/kubo/core/coreiface"
20 + "github.com/ipfs/kubo/core/coreiface/options"
21 "github.com/ipfs/kubo/core/node/libp2p"
22 "github.com/ipfs/kubo/repo/fsrepo"
23 "github.com/ipfs/kubo/repo/fsrepo/migrations"
test/dependencies/go.mod
+2 -1
@@ -104,7 +104,7 @@ require (
104 github.com/hexops/gotextdiff v1.0.3 // indirect
105 github.com/inconshreveable/mousetrap v1.1.0 // indirect
106 github.com/ipfs/bbloom v0.0.4 // indirect
107 - github.com/ipfs/boxo v0.15.0 // indirect
107 + github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86 // indirect
108 github.com/ipfs/go-block-format v0.2.0 // indirect
109 github.com/ipfs/go-cid v0.4.1 // indirect
110 github.com/ipfs/go-datastore v0.6.0 // indirect
@@ -191,6 +191,7 @@ require (
191 github.com/russross/blackfriday/v2 v2.1.0 // indirect
192 github.com/ryancurrah/gomodguard v1.3.0 // indirect
193 github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
194 + github.com/samber/lo v1.36.0 // indirect
195 github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
196 github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
197 github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
test/dependencies/go.sum
+5 -2
@@ -344,8 +344,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
344 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
345 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
346 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
347 -github.com/ipfs/boxo v0.15.0 h1:BriLydj2nlK1nKeJQHxcKSuG5ZXcoutzhBklOtxC5pk=
348 -github.com/ipfs/boxo v0.15.0/go.mod h1:X5ulcbR5Nh7sm3Db8+08AApUo6FsGC5mb23QDKAoB/M=
347 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86 h1:9a7ug9Llglmdbzgj/gdKbPoZrd3EoaartzepObr/jlc=
348 +github.com/ipfs/boxo v0.15.1-0.20231129112844-08959f281f86/go.mod h1:jAgpNQn7T7BnibUeReXcKU9Ha1xmYNyOlwVEl193ow0=
349 github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=
350 github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
351 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
@@ -640,6 +640,8 @@ github.com/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJ
640 github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50=
641 github.com/ryanrolds/sqlclosecheck v0.4.0 h1:i8SX60Rppc1wRuyQjMciLqIzV3xnoHB7/tXbr6RGYNI=
642 github.com/ryanrolds/sqlclosecheck v0.4.0/go.mod h1:TBRRjzL31JONc9i4XMinicuo+s+E8yKZ5FN8X3G6CKQ=
643 +github.com/samber/lo v1.36.0 h1:4LaOxH1mHnbDGhTVE0i1z8v/lWaQW8AIfOD3HU4mSaw=
644 +github.com/samber/lo v1.36.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
645 github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc=
646 github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
647 github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw=
@@ -721,6 +723,7 @@ github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpR
723 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
724 github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw=
725 github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8=
726 +github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
727 github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
728 github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
729 github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4=