chore: migrate from go-libipfs to boxo

This commit was moved from ipfs/go-ipfs-http-client@ae996cb
ipfs · Apr 18, 2023 · 8bebfc0 · 8bebfc0
1 parent 5c21cf0
commit 8bebfc0
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 45 deletions.
diff --git a/client/httpapi/api.go b/client/httpapi/api.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
 	"github.com/mitchellh/go-homedir"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"

diff --git a/client/httpapi/api_test.go b/client/httpapi/api_test.go
@@ -12,10 +12,9 @@ import (
 	"testing"
 	"time"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	"github.com/ipfs/interface-go-ipfs-core/path"
-
-	"github.com/ipfs/interface-go-ipfs-core/tests"
+	iface "github.com/ipfs/boxo/coreiface"
+	"github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/boxo/coreiface/tests"
 	local "github.com/ipfs/iptb-plugins/local"
 	"github.com/ipfs/iptb/testbed"
 	testbedi "github.com/ipfs/iptb/testbed/interfaces"

diff --git a/client/httpapi/apifile.go b/client/httpapi/apifile.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/boxo/files"
+	unixfs "github.com/ipfs/boxo/ipld/unixfs"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-libipfs/files"
-	unixfs "github.com/ipfs/go-unixfs"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 )
 
 const forwardSeekLimit = 1 << 14 //16k

diff --git a/client/httpapi/block.go b/client/httpapi/block.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"io"
 
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
 	"github.com/ipfs/go-cid"
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	mc "github.com/multiformats/go-multicodec"
 	mh "github.com/multiformats/go-multihash"
 )

diff --git a/client/httpapi/dag.go b/client/httpapi/dag.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	format "github.com/ipfs/go-ipld-format"
-	"github.com/ipfs/go-libipfs/blocks"
-	"github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	multicodec "github.com/multiformats/go-multicodec"
 )
 

diff --git a/client/httpapi/dht.go b/client/httpapi/dht.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/routing"
 )

diff --git a/client/httpapi/key.go b/client/httpapi/key.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
 

diff --git a/client/httpapi/name.go b/client/httpapi/name.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"io"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
-	"github.com/ipfs/interface-go-ipfs-core/path"
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	nsopts "github.com/ipfs/boxo/coreiface/options/namesys"
+	"github.com/ipfs/boxo/coreiface/path"
 )
 
 type NameAPI HttpApi

diff --git a/client/httpapi/object.go b/client/httpapi/object.go
@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"io"
 
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/boxo/ipld/merkledag"
+	ft "github.com/ipfs/boxo/ipld/unixfs"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	"github.com/ipfs/go-merkledag"
-	ft "github.com/ipfs/go-unixfs"
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 )
 
 type ObjectAPI HttpApi

diff --git a/client/httpapi/path.go b/client/httpapi/path.go
@@ -3,10 +3,10 @@ package httpapi
 import (
 	"context"
 
+	"github.com/ipfs/boxo/coreiface/path"
+	ipfspath "github.com/ipfs/boxo/path"
 	cid "github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	ipfspath "github.com/ipfs/go-path"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 )
 
 func (api *HttpApi) ResolvePath(ctx context.Context, p path.Path) (path.Resolved, error) {

diff --git a/client/httpapi/pin.go b/client/httpapi/pin.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"strings"
 
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
 	"github.com/ipfs/go-cid"
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	"github.com/pkg/errors"
 )
 

diff --git a/client/httpapi/pubsub.go b/client/httpapi/pubsub.go
@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"io"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
 	"github.com/libp2p/go-libp2p/core/peer"
 	mbase "github.com/multiformats/go-multibase"
 )

diff --git a/client/httpapi/requestbuilder.go b/client/httpapi/requestbuilder.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ipfs/go-libipfs/files"
+	"github.com/ipfs/boxo/files"
 )
 
 type RequestBuilder interface {

diff --git a/client/httpapi/response.go b/client/httpapi/response.go
@@ -10,9 +10,9 @@ import (
 	"net/url"
 	"os"
 
+	"github.com/ipfs/boxo/files"
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
-	"github.com/ipfs/go-libipfs/files"
 )
 
 type Error = cmds.Error

diff --git a/client/httpapi/swarm.go b/client/httpapi/swarm.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	iface "github.com/ipfs/interface-go-ipfs-core"
+	iface "github.com/ipfs/boxo/coreiface"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"

diff --git a/client/httpapi/unixfs.go b/client/httpapi/unixfs.go
@@ -7,13 +7,13 @@ import (
 	"fmt"
 	"io"
 
+	iface "github.com/ipfs/boxo/coreiface"
+	caopts "github.com/ipfs/boxo/coreiface/options"
+	"github.com/ipfs/boxo/coreiface/path"
+	"github.com/ipfs/boxo/files"
+	unixfs "github.com/ipfs/boxo/ipld/unixfs"
+	unixfs_pb "github.com/ipfs/boxo/ipld/unixfs/pb"
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-libipfs/files"
-	unixfs "github.com/ipfs/go-unixfs"
-	unixfs_pb "github.com/ipfs/go-unixfs/pb"
-	iface "github.com/ipfs/interface-go-ipfs-core"
-	caopts "github.com/ipfs/interface-go-ipfs-core/options"
-	"github.com/ipfs/interface-go-ipfs-core/path"
 	mh "github.com/multiformats/go-multihash"
 )