chore: boxo: migrate from go-libipfs to boxo

filecoin-project · Mar 25, 2023 · f1a4122 · f1a4122
1 parent 41fce94
commit f1a4122
Show file tree

Hide file tree

Showing 72 changed files with 127 additions and 122 deletions.
diff --git a/api/api_full.go b/api/api_full.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/filecoin-project/go-address"

diff --git a/api/api_gateway.go b/api/api_gateway.go
@@ -3,8 +3,8 @@ package api
 import (
 	"context"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-jsonrpc"

diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
@@ -16,7 +16,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-graphsync"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/metrics"

diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go
diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/api/v0api/full.go b/api/v0api/full.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	"github.com/libp2p/go-libp2p/core/peer"
 

diff --git a/api/v0api/gateway.go b/api/v0api/gateway.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"

diff --git a/api/v0api/proxy_gen.go b/api/v0api/proxy_gen.go
diff --git a/api/v0api/v0mocks/mock_full.go b/api/v0api/v0mocks/mock_full.go
diff --git a/blockstore/api.go b/blockstore/api.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/autobatch.go b/blockstore/autobatch.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/badger/blockstore.go b/blockstore/badger/blockstore.go
@@ -15,7 +15,7 @@ import (
 	"github.com/dgraph-io/badger/v2/pb"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	logger "github.com/ipfs/go-log/v2"
 	pool "github.com/libp2p/go-buffer-pool"
 	"github.com/multiformats/go-base32"

diff --git a/blockstore/badger/blockstore_test.go b/blockstore/badger/blockstore_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 

diff --git a/blockstore/badger/blockstore_test_suite.go b/blockstore/badger/blockstore_test_suite.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ipfs/go-cid"
 	u "github.com/ipfs/go-ipfs-util"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/lotus/blockstore"

diff --git a/blockstore/buffered.go b/blockstore/buffered.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 )
 
 // buflog is a logger for the buffered blockstore. It is subscoped from the

diff --git a/blockstore/discard.go b/blockstore/discard.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 )
 
 var _ Blockstore = (*discardstore)(nil)

diff --git a/blockstore/fallback.go b/blockstore/fallback.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/idstore.go b/blockstore/idstore.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	mh "github.com/multiformats/go-multihash"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/ipfs.go b/blockstore/ipfs.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	httpapi "github.com/ipfs/go-ipfs-http-client"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	iface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
 	"github.com/ipfs/interface-go-ipfs-core/path"

diff --git a/blockstore/mem.go b/blockstore/mem.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 )
 
 // NewMemory returns a temporary memory-backed blockstore.

diff --git a/blockstore/mem_test.go b/blockstore/mem_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	mh "github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
 )

diff --git a/blockstore/net.go b/blockstore/net.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/libp2p/go-msgio"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"

diff --git a/blockstore/net_serve.go b/blockstore/net_serve.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 	"github.com/libp2p/go-msgio"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"

diff --git a/blockstore/net_test.go b/blockstore/net_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 	"github.com/libp2p/go-msgio"
 	"github.com/stretchr/testify/require"
 )

diff --git a/blockstore/splitstore/debug.go b/blockstore/splitstore/debug.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"go.uber.org/multierr"
 	"golang.org/x/xerrors"
 )

diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ipfs/go-cid"
 	dstore "github.com/ipfs/go-datastore"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"
 	"go.uber.org/multierr"

diff --git a/blockstore/splitstore/splitstore_compact.go b/blockstore/splitstore/splitstore_compact.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"go.opencensus.io/stats"
 	"golang.org/x/sync/errgroup"

diff --git a/blockstore/splitstore/splitstore_expose.go b/blockstore/splitstore/splitstore_expose.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 
 	bstore "github.com/filecoin-project/lotus/blockstore"
 )

diff --git a/blockstore/splitstore/splitstore_reify.go b/blockstore/splitstore/splitstore_reify.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 )
 

diff --git a/blockstore/splitstore/splitstore_test.go b/blockstore/splitstore/splitstore_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	logging "github.com/ipfs/go-log/v2"
 	mh "github.com/multiformats/go-multihash"
 

diff --git a/blockstore/splitstore/splitstore_warmup.go b/blockstore/splitstore/splitstore_warmup.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-state-types/abi"

diff --git a/blockstore/sync.go b/blockstore/sync.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 )
 
 // NewMemorySync returns a thread-safe in-memory blockstore.

diff --git a/blockstore/timed.go b/blockstore/timed.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/raulk/clock"
 	"go.uber.org/multierr"
 )

diff --git a/blockstore/timed_test.go b/blockstore/timed_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/raulk/clock"
 	"github.com/stretchr/testify/require"
 )

diff --git a/blockstore/union.go b/blockstore/union.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 )
 
 type unionBlockstore []Blockstore

diff --git a/blockstore/union_test.go b/blockstore/union_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/chain/events/state/mock/api.go b/chain/events/state/mock/api.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"

diff --git a/chain/gen/genesis/genblock.go b/chain/gen/genesis/genblock.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/multiformats/go-multihash"
 )
 

diff --git a/chain/index/msgindex_test.go b/chain/index/msgindex_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-libipfs/blocks"
+	"github.com/ipfs/go-block-format"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"

diff --git a/chain/store/messages.go b/chain/store/messages.go
@@ -6,7 +6,7 @@ import (
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	ipld "github.com/ipfs/go-ipld-format"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 	cbg "github.com/whyrusleeping/cbor-gen"
 	"golang.org/x/xerrors"
 

diff --git a/chain/store/snapshot.go b/chain/store/snapshot.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipld/go-car"
 	carutil "github.com/ipld/go-car/util"
 	carv2 "github.com/ipld/go-car/v2"

diff --git a/chain/store/store.go b/chain/store/store.go
@@ -16,7 +16,7 @@ import (
 	dstore "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/query"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	block "github.com/ipfs/go-libipfs/blocks"
+	block "github.com/ipfs/go-block-format"
 	logging "github.com/ipfs/go-log/v2"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"

diff --git a/chain/sub/incoming.go b/chain/sub/incoming.go
@@ -10,7 +10,7 @@ import (
 	lru "github.com/hashicorp/golang-lru/v2"
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipni/storetheindex/announce/message"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"

diff --git a/chain/sub/incoming_test.go b/chain/sub/incoming_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/ipfs/go-cid"
-	blocks "github.com/ipfs/go-libipfs/blocks"
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipni/storetheindex/announce/message"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	pb "github.com/libp2p/go-libp2p-pubsub/pb"