Skip to content

Commit 3ab1086

Browse files
Jorropoguseggert
Jorropo
authored and
guseggert
committed
chore: migrate go-libipfs to boxo
Resolves #9677, #9676, #9675, #9736
1 parent 1e3b6c9 commit 3ab1086

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+554
-1713
lines changed

‎assets/assets.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/ipfs/kubo/core"
99
"github.com/ipfs/kubo/core/coreapi"
1010

11+
options "github.com/ipfs/boxo/coreiface/options"
12+
"github.com/ipfs/boxo/coreiface/path"
13+
"github.com/ipfs/boxo/files"
1114
cid "github.com/ipfs/go-cid"
12-
"github.com/ipfs/go-libipfs/files"
13-
options "github.com/ipfs/interface-go-ipfs-core/options"
14-
"github.com/ipfs/interface-go-ipfs-core/path"
1515
)
1616

1717
//go:embed init-doc

‎blocks/blockstoreutil/remove.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"errors"
77
"fmt"
88

9+
bs "github.com/ipfs/boxo/blockstore"
10+
pin "github.com/ipfs/boxo/pinning/pinner"
911
cid "github.com/ipfs/go-cid"
10-
bs "github.com/ipfs/go-ipfs-blockstore"
11-
pin "github.com/ipfs/go-ipfs-pinner"
1212
format "github.com/ipfs/go-ipld-format"
1313
)
1414

‎cmd/ipfs/add_migrations.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/ipfs/go-libipfs/files"
12-
coreiface "github.com/ipfs/interface-go-ipfs-core"
13-
"github.com/ipfs/interface-go-ipfs-core/options"
14-
ipath "github.com/ipfs/interface-go-ipfs-core/path"
11+
coreiface "github.com/ipfs/boxo/coreiface"
12+
"github.com/ipfs/boxo/coreiface/options"
13+
ipath "github.com/ipfs/boxo/coreiface/path"
14+
"github.com/ipfs/boxo/files"
1515
"github.com/ipfs/kubo/core"
1616
"github.com/ipfs/kubo/core/coreapi"
1717
"github.com/ipfs/kubo/repo/fsrepo/migrations"

‎cmd/ipfs/daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
pnet "github.com/libp2p/go-libp2p/core/pnet"
3535
sockets "github.com/libp2p/go-socket-activation"
3636

37+
options "github.com/ipfs/boxo/coreiface/options"
3738
cmds "github.com/ipfs/go-ipfs-cmds"
3839
mprome "github.com/ipfs/go-metrics-prometheus"
39-
options "github.com/ipfs/interface-go-ipfs-core/options"
4040
goprocess "github.com/jbenet/goprocess"
4141
ma "github.com/multiformats/go-multiaddr"
4242
manet "github.com/multiformats/go-multiaddr/net"

‎cmd/ipfs/init.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ import (
1010
"path/filepath"
1111
"strings"
1212

13-
path "github.com/ipfs/go-path"
14-
unixfs "github.com/ipfs/go-unixfs"
13+
unixfs "github.com/ipfs/boxo/ipld/unixfs"
14+
path "github.com/ipfs/boxo/path"
1515
assets "github.com/ipfs/kubo/assets"
1616
oldcmds "github.com/ipfs/kubo/commands"
1717
core "github.com/ipfs/kubo/core"
1818
"github.com/ipfs/kubo/core/commands"
1919
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
2020

21+
options "github.com/ipfs/boxo/coreiface/options"
22+
"github.com/ipfs/boxo/files"
2123
cmds "github.com/ipfs/go-ipfs-cmds"
22-
"github.com/ipfs/go-libipfs/files"
23-
options "github.com/ipfs/interface-go-ipfs-core/options"
2424
config "github.com/ipfs/kubo/config"
2525
)
2626

‎cmd/ipfs/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"time"
1515

1616
"github.com/google/uuid"
17+
u "github.com/ipfs/boxo/util"
1718
cmds "github.com/ipfs/go-ipfs-cmds"
1819
"github.com/ipfs/go-ipfs-cmds/cli"
1920
cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
20-
u "github.com/ipfs/go-ipfs-util"
2121
logging "github.com/ipfs/go-log"
2222
"github.com/ipfs/kubo/cmd/ipfs/util"
2323
oldcmds "github.com/ipfs/kubo/commands"

‎cmd/ipfs/pinmfs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/libp2p/go-libp2p/core/host"
99
peer "github.com/libp2p/go-libp2p/core/peer"
1010

11+
pinclient "github.com/ipfs/boxo/pinning/remote/client"
1112
cid "github.com/ipfs/go-cid"
1213
ipld "github.com/ipfs/go-ipld-format"
1314
logging "github.com/ipfs/go-log"
14-
pinclient "github.com/ipfs/go-pinning-service-http-client"
1515

1616
config "github.com/ipfs/kubo/config"
1717
"github.com/ipfs/kubo/core"

‎cmd/ipfs/pinmfs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

10+
merkledag "github.com/ipfs/boxo/ipld/merkledag"
1011
ipld "github.com/ipfs/go-ipld-format"
11-
merkledag "github.com/ipfs/go-merkledag"
1212
config "github.com/ipfs/kubo/config"
1313
"github.com/libp2p/go-libp2p/core/host"
1414
peer "github.com/libp2p/go-libp2p/core/peer"

‎cmd/ipfswatch/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
fsrepo "github.com/ipfs/kubo/repo/fsrepo"
2020

2121
fsnotify "github.com/fsnotify/fsnotify"
22-
"github.com/ipfs/go-libipfs/files"
22+
"github.com/ipfs/boxo/files"
2323
process "github.com/jbenet/goprocess"
2424
homedir "github.com/mitchellh/go-homedir"
2525
)

‎commands/context.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
coreapi "github.com/ipfs/kubo/core/coreapi"
1111
loader "github.com/ipfs/kubo/plugin/loader"
1212

13+
coreiface "github.com/ipfs/boxo/coreiface"
14+
options "github.com/ipfs/boxo/coreiface/options"
1315
cmds "github.com/ipfs/go-ipfs-cmds"
1416
logging "github.com/ipfs/go-log"
15-
coreiface "github.com/ipfs/interface-go-ipfs-core"
16-
options "github.com/ipfs/interface-go-ipfs-core/options"
1717
config "github.com/ipfs/kubo/config"
1818
)
1919

‎config/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"io"
88
"time"
99

10-
"github.com/ipfs/interface-go-ipfs-core/options"
10+
"github.com/ipfs/boxo/coreiface/options"
1111
"github.com/libp2p/go-libp2p/core/crypto"
1212
"github.com/libp2p/go-libp2p/core/peer"
1313
)

‎config/init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"testing"
66

7-
"github.com/ipfs/interface-go-ipfs-core/options"
7+
"github.com/ipfs/boxo/coreiface/options"
88
crypto_pb "github.com/libp2p/go-libp2p/core/crypto/pb"
99
)
1010

‎core/commands/add.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
"github.com/ipfs/kubo/core/commands/cmdenv"
1212

1313
"github.com/cheggaaa/pb"
14+
coreiface "github.com/ipfs/boxo/coreiface"
15+
"github.com/ipfs/boxo/coreiface/options"
16+
"github.com/ipfs/boxo/files"
17+
mfs "github.com/ipfs/boxo/mfs"
1418
cmds "github.com/ipfs/go-ipfs-cmds"
1519
ipld "github.com/ipfs/go-ipld-format"
16-
"github.com/ipfs/go-libipfs/files"
17-
mfs "github.com/ipfs/go-mfs"
18-
coreiface "github.com/ipfs/interface-go-ipfs-core"
19-
"github.com/ipfs/interface-go-ipfs-core/options"
2020
mh "github.com/multiformats/go-multihash"
2121
)
2222

‎core/commands/bitswap.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
e "github.com/ipfs/kubo/core/commands/e"
99

1010
humanize "github.com/dustin/go-humanize"
11+
bitswap "github.com/ipfs/boxo/bitswap"
12+
"github.com/ipfs/boxo/bitswap/server"
1113
cidutil "github.com/ipfs/go-cidutil"
1214
cmds "github.com/ipfs/go-ipfs-cmds"
13-
bitswap "github.com/ipfs/go-libipfs/bitswap"
14-
"github.com/ipfs/go-libipfs/bitswap/server"
1515
peer "github.com/libp2p/go-libp2p/core/peer"
1616
)
1717

‎core/commands/block.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"io"
77
"os"
88

9-
"github.com/ipfs/go-libipfs/files"
9+
"github.com/ipfs/boxo/files"
1010

1111
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
1212
"github.com/ipfs/kubo/core/commands/cmdutils"
1313

14+
options "github.com/ipfs/boxo/coreiface/options"
15+
path "github.com/ipfs/boxo/coreiface/path"
1416
cmds "github.com/ipfs/go-ipfs-cmds"
15-
options "github.com/ipfs/interface-go-ipfs-core/options"
16-
path "github.com/ipfs/interface-go-ipfs-core/path"
1717
mh "github.com/multiformats/go-multihash"
1818
)
1919

‎core/commands/cat.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"github.com/ipfs/kubo/core/commands/cmdenv"
1010

1111
"github.com/cheggaaa/pb"
12+
iface "github.com/ipfs/boxo/coreiface"
13+
"github.com/ipfs/boxo/coreiface/path"
14+
"github.com/ipfs/boxo/files"
1215
cmds "github.com/ipfs/go-ipfs-cmds"
13-
"github.com/ipfs/go-libipfs/files"
14-
iface "github.com/ipfs/interface-go-ipfs-core"
15-
"github.com/ipfs/interface-go-ipfs-core/path"
1616
)
1717

1818
const (

‎core/commands/cid.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"strings"
88
"unicode"
99

10+
verifcid "github.com/ipfs/boxo/verifcid"
1011
cid "github.com/ipfs/go-cid"
1112
cidutil "github.com/ipfs/go-cidutil"
1213
cmds "github.com/ipfs/go-ipfs-cmds"
13-
verifcid "github.com/ipfs/go-verifcid"
1414
ipldmulticodec "github.com/ipld/go-ipld-prime/multicodec"
1515
mbase "github.com/multiformats/go-multibase"
1616
mc "github.com/multiformats/go-multicodec"

‎core/commands/cmdenv/env.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/ipfs/kubo/commands"
99
"github.com/ipfs/kubo/core"
1010

11+
coreiface "github.com/ipfs/boxo/coreiface"
12+
options "github.com/ipfs/boxo/coreiface/options"
1113
cmds "github.com/ipfs/go-ipfs-cmds"
1214
logging "github.com/ipfs/go-log"
13-
coreiface "github.com/ipfs/interface-go-ipfs-core"
14-
options "github.com/ipfs/interface-go-ipfs-core/options"
1515
)
1616

1717
var log = logging.Logger("core/commands/cmdenv")

‎core/commands/cmdenv/file.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmdenv
33
import (
44
"fmt"
55

6-
"github.com/ipfs/go-libipfs/files"
6+
"github.com/ipfs/boxo/files"
77
)
88

99
// GetFileArg returns the next file from the directory or an error

‎core/commands/cmdutils/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
cmds "github.com/ipfs/go-ipfs-cmds"
77

8+
coreiface "github.com/ipfs/boxo/coreiface"
89
"github.com/ipfs/go-cid"
9-
coreiface "github.com/ipfs/interface-go-ipfs-core"
1010
)
1111

1212
const (

‎core/commands/dag/dag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/ipfs/kubo/core/commands/cmdenv"
88
"github.com/ipfs/kubo/core/commands/cmdutils"
99

10+
ipfspath "github.com/ipfs/boxo/path"
1011
cid "github.com/ipfs/go-cid"
1112
cidenc "github.com/ipfs/go-cidutil/cidenc"
1213
cmds "github.com/ipfs/go-ipfs-cmds"
13-
ipfspath "github.com/ipfs/go-path"
1414
//gipfree "github.com/ipld/go-ipld-prime/impl/free"
1515
//gipselector "github.com/ipld/go-ipld-prime/traversal/selector"
1616
//gipselectorbuilder "github.com/ipld/go-ipld-prime/traversal/selector/builder"

‎core/commands/dag/export.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
"time"
1010

1111
"github.com/cheggaaa/pb"
12+
iface "github.com/ipfs/boxo/coreiface"
13+
blocks "github.com/ipfs/go-block-format"
1214
cid "github.com/ipfs/go-cid"
1315
ipld "github.com/ipfs/go-ipld-format"
14-
blocks "github.com/ipfs/go-libipfs/blocks"
15-
iface "github.com/ipfs/interface-go-ipfs-core"
1616
"github.com/ipfs/kubo/core/commands/cmdenv"
1717

18+
gocar "github.com/ipfs/boxo/ipld/car"
1819
cmds "github.com/ipfs/go-ipfs-cmds"
19-
gocar "github.com/ipld/go-car"
2020
selectorparse "github.com/ipld/go-ipld-prime/traversal/selector/parse"
2121
)
2222

‎core/commands/dag/get.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"io"
66

7+
"github.com/ipfs/boxo/coreiface/path"
78
ipldlegacy "github.com/ipfs/go-ipld-legacy"
8-
"github.com/ipfs/interface-go-ipfs-core/path"
99
"github.com/ipfs/kubo/core/commands/cmdenv"
1010

1111
"github.com/ipld/go-ipld-prime"

‎core/commands/dag/import.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"errors"
55
"io"
66

7+
"github.com/ipfs/boxo/coreiface/options"
8+
"github.com/ipfs/boxo/files"
9+
gocarv2 "github.com/ipfs/boxo/ipld/car/v2"
710
cid "github.com/ipfs/go-cid"
811
cmds "github.com/ipfs/go-ipfs-cmds"
912
ipld "github.com/ipfs/go-ipld-format"
1013
ipldlegacy "github.com/ipfs/go-ipld-legacy"
11-
"github.com/ipfs/go-libipfs/files"
12-
"github.com/ipfs/interface-go-ipfs-core/options"
13-
gocarv2 "github.com/ipld/go-car/v2"
1414

1515
"github.com/ipfs/kubo/core/commands/cmdenv"
1616
"github.com/ipfs/kubo/core/commands/cmdutils"

‎core/commands/dag/put.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import (
44
"bytes"
55
"fmt"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
89
ipldlegacy "github.com/ipfs/go-ipld-legacy"
9-
blocks "github.com/ipfs/go-libipfs/blocks"
1010
"github.com/ipfs/kubo/core/commands/cmdenv"
1111
"github.com/ipfs/kubo/core/commands/cmdutils"
1212
"github.com/ipld/go-ipld-prime/multicodec"
1313
basicnode "github.com/ipld/go-ipld-prime/node/basic"
1414

15+
"github.com/ipfs/boxo/files"
1516
cmds "github.com/ipfs/go-ipfs-cmds"
1617
ipld "github.com/ipfs/go-ipld-format"
17-
"github.com/ipfs/go-libipfs/files"
1818
mc "github.com/multiformats/go-multicodec"
1919

2020
// Expected minimal set of available format/ienc codecs.

‎core/commands/dag/resolve.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dagcmd
22

33
import (
4-
"github.com/ipfs/interface-go-ipfs-core/path"
4+
"github.com/ipfs/boxo/coreiface/path"
55
"github.com/ipfs/kubo/core/commands/cmdenv"
66

77
cmds "github.com/ipfs/go-ipfs-cmds"

‎core/commands/dag/stat.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"io"
66
"os"
77

8-
"github.com/ipfs/go-merkledag/traverse"
9-
"github.com/ipfs/interface-go-ipfs-core/path"
8+
"github.com/ipfs/boxo/coreiface/path"
9+
"github.com/ipfs/boxo/ipld/merkledag/traverse"
1010
"github.com/ipfs/kubo/core/commands/cmdenv"
1111
"github.com/ipfs/kubo/core/commands/e"
1212

13+
mdag "github.com/ipfs/boxo/ipld/merkledag"
1314
cmds "github.com/ipfs/go-ipfs-cmds"
14-
mdag "github.com/ipfs/go-merkledag"
1515
)
1616

1717
func dagStat(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {

‎core/commands/dht_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package commands
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-namesys"
6+
"github.com/ipfs/boxo/namesys"
77

8-
ipns "github.com/ipfs/go-ipns"
8+
ipns "github.com/ipfs/boxo/ipns"
99
"github.com/libp2p/go-libp2p/core/test"
1010
)
1111

‎core/commands/dns.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"io"
66

7-
namesys "github.com/ipfs/go-namesys"
8-
nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
7+
nsopts "github.com/ipfs/boxo/coreiface/options/namesys"
8+
namesys "github.com/ipfs/boxo/namesys"
99
cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
1010
ncmd "github.com/ipfs/kubo/core/commands/name"
1111

0 commit comments

Comments
 (0)