Skip to content

Commit fe42d97

Browse files
JorropoJorropo
committed
chore: all: migrate from go-libipfs to boxo
github.com/ipfs/libipfs/blocks was unmigrated to github.com/ipfs/go-block-format due to compatibility issues with the rest of the IPLD stack.
1 parent 9d44c88 commit fe42d97

Some content is hidden

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

72 files changed

+130
-125
lines changed

‎api/api_full.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
"github.com/google/uuid"
10+
blocks "github.com/ipfs/go-block-format"
1011
"github.com/ipfs/go-cid"
11-
blocks "github.com/ipfs/go-libipfs/blocks"
1212
"github.com/libp2p/go-libp2p/core/peer"
1313

1414
"github.com/filecoin-project/go-address"

‎api/api_gateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package api
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
7-
blocks "github.com/ipfs/go-libipfs/blocks"
88

99
"github.com/filecoin-project/go-address"
1010
"github.com/filecoin-project/go-jsonrpc"

‎api/docgen/docgen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"unicode"
1515

1616
"github.com/google/uuid"
17+
blocks "github.com/ipfs/go-block-format"
1718
"github.com/ipfs/go-cid"
1819
"github.com/ipfs/go-graphsync"
19-
blocks "github.com/ipfs/go-libipfs/blocks"
2020
textselector "github.com/ipld/go-ipld-selector-text-lite"
2121
pubsub "github.com/libp2p/go-libp2p-pubsub"
2222
"github.com/libp2p/go-libp2p/core/metrics"

‎api/mocks/mock_full.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/proxy_gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v0api/full.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package v0api
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
7-
blocks "github.com/ipfs/go-libipfs/blocks"
88
textselector "github.com/ipld/go-ipld-selector-text-lite"
99
"github.com/libp2p/go-libp2p/core/peer"
1010

‎api/v0api/gateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package v0api
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
7-
blocks "github.com/ipfs/go-libipfs/blocks"
88

99
"github.com/filecoin-project/go-address"
1010
"github.com/filecoin-project/go-state-types/abi"

‎api/v0api/proxy_gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v0api/v0mocks/mock_full.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blockstore/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package blockstore
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
7-
blocks "github.com/ipfs/go-libipfs/blocks"
88
"golang.org/x/xerrors"
99
)
1010

‎blockstore/autobatch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"sync"
66
"time"
77

8+
block "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
910
ipld "github.com/ipfs/go-ipld-format"
10-
block "github.com/ipfs/go-libipfs/blocks"
1111
"golang.org/x/xerrors"
1212
)
1313

‎blockstore/badger/blockstore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"github.com/dgraph-io/badger/v2"
1414
"github.com/dgraph-io/badger/v2/options"
1515
"github.com/dgraph-io/badger/v2/pb"
16+
blocks "github.com/ipfs/go-block-format"
1617
"github.com/ipfs/go-cid"
1718
ipld "github.com/ipfs/go-ipld-format"
18-
blocks "github.com/ipfs/go-libipfs/blocks"
1919
logger "github.com/ipfs/go-log/v2"
2020
pool "github.com/libp2p/go-buffer-pool"
2121
"github.com/multiformats/go-base32"

‎blockstore/badger/blockstore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111
"testing"
1212

13+
blocks "github.com/ipfs/go-block-format"
1314
"github.com/ipfs/go-cid"
14-
blocks "github.com/ipfs/go-libipfs/blocks"
1515
"github.com/stretchr/testify/require"
1616
"golang.org/x/sync/errgroup"
1717

‎blockstore/badger/blockstore_test_suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"strings"
1010
"testing"
1111

12+
blocks "github.com/ipfs/go-block-format"
1213
"github.com/ipfs/go-cid"
1314
u "github.com/ipfs/go-ipfs-util"
1415
ipld "github.com/ipfs/go-ipld-format"
15-
blocks "github.com/ipfs/go-libipfs/blocks"
1616
"github.com/stretchr/testify/require"
1717

1818
"github.com/filecoin-project/lotus/blockstore"

‎blockstore/buffered.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"os"
66

7+
block "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
89
ipld "github.com/ipfs/go-ipld-format"
9-
block "github.com/ipfs/go-libipfs/blocks"
1010
)
1111

1212
// buflog is a logger for the buffered blockstore. It is subscoped from the

‎blockstore/discard.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"io"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
)
1010

1111
var _ Blockstore = (*discardstore)(nil)

‎blockstore/fallback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"sync"
66
"time"
77

8+
blocks "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
910
ipld "github.com/ipfs/go-ipld-format"
10-
blocks "github.com/ipfs/go-libipfs/blocks"
1111
"golang.org/x/xerrors"
1212
)
1313

‎blockstore/idstore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"io"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
mh "github.com/multiformats/go-multihash"
1010
"golang.org/x/xerrors"
1111
)

‎blockstore/ipfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"context"
66
"io"
77

8+
blocks "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
910
httpapi "github.com/ipfs/go-ipfs-http-client"
10-
blocks "github.com/ipfs/go-libipfs/blocks"
1111
iface "github.com/ipfs/interface-go-ipfs-core"
1212
"github.com/ipfs/interface-go-ipfs-core/options"
1313
"github.com/ipfs/interface-go-ipfs-core/path"

‎blockstore/mem.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package blockstore
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
78
ipld "github.com/ipfs/go-ipld-format"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
)
1010

1111
// NewMemory returns a temporary memory-backed blockstore.

‎blockstore/mem_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
mh "github.com/multiformats/go-multihash"
1010
"github.com/stretchr/testify/require"
1111
)

‎blockstore/net.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"sync"
99
"sync/atomic"
1010

11+
blocks "github.com/ipfs/go-block-format"
1112
"github.com/ipfs/go-cid"
1213
ipld "github.com/ipfs/go-ipld-format"
13-
blocks "github.com/ipfs/go-libipfs/blocks"
1414
"github.com/libp2p/go-msgio"
1515
cbg "github.com/whyrusleeping/cbor-gen"
1616
"golang.org/x/xerrors"

‎blockstore/net_serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"context"
66
"encoding/binary"
77

8+
block "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
910
ipld "github.com/ipfs/go-ipld-format"
10-
block "github.com/ipfs/go-libipfs/blocks"
1111
"github.com/libp2p/go-msgio"
1212
cbg "github.com/whyrusleeping/cbor-gen"
1313
"golang.org/x/xerrors"

‎blockstore/net_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io"
77
"testing"
88

9+
block "github.com/ipfs/go-block-format"
910
ipld "github.com/ipfs/go-ipld-format"
10-
block "github.com/ipfs/go-libipfs/blocks"
1111
"github.com/libp2p/go-msgio"
1212
"github.com/stretchr/testify/require"
1313
)

‎blockstore/splitstore/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"sync"
1313
"time"
1414

15+
blocks "github.com/ipfs/go-block-format"
1516
"github.com/ipfs/go-cid"
16-
blocks "github.com/ipfs/go-libipfs/blocks"
1717
"go.uber.org/multierr"
1818
"golang.org/x/xerrors"
1919
)

‎blockstore/splitstore/splitstore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"sync/atomic"
99
"time"
1010

11+
blocks "github.com/ipfs/go-block-format"
1112
"github.com/ipfs/go-cid"
1213
dstore "github.com/ipfs/go-datastore"
1314
ipld "github.com/ipfs/go-ipld-format"
14-
blocks "github.com/ipfs/go-libipfs/blocks"
1515
logging "github.com/ipfs/go-log/v2"
1616
"go.opencensus.io/stats"
1717
"go.uber.org/multierr"

‎blockstore/splitstore/splitstore_compact.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"sync/atomic"
1111
"time"
1212

13+
blocks "github.com/ipfs/go-block-format"
1314
"github.com/ipfs/go-cid"
1415
ipld "github.com/ipfs/go-ipld-format"
15-
blocks "github.com/ipfs/go-libipfs/blocks"
1616
cbg "github.com/whyrusleeping/cbor-gen"
1717
"go.opencensus.io/stats"
1818
"golang.org/x/sync/errgroup"

‎blockstore/splitstore/splitstore_expose.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"errors"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
89
ipld "github.com/ipfs/go-ipld-format"
9-
blocks "github.com/ipfs/go-libipfs/blocks"
1010

1111
bstore "github.com/filecoin-project/lotus/blockstore"
1212
)

‎blockstore/splitstore/splitstore_reify.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"runtime"
66
"sync/atomic"
77

8+
blocks "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
9-
blocks "github.com/ipfs/go-libipfs/blocks"
1010
"golang.org/x/xerrors"
1111
)
1212

‎blockstore/splitstore/splitstore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"testing"
1212
"time"
1313

14+
blocks "github.com/ipfs/go-block-format"
1415
"github.com/ipfs/go-cid"
1516
"github.com/ipfs/go-datastore"
1617
dssync "github.com/ipfs/go-datastore/sync"
1718
ipld "github.com/ipfs/go-ipld-format"
18-
blocks "github.com/ipfs/go-libipfs/blocks"
1919
logging "github.com/ipfs/go-log/v2"
2020
mh "github.com/multiformats/go-multihash"
2121

‎blockstore/splitstore/splitstore_warmup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"sync/atomic"
66
"time"
77

8+
blocks "github.com/ipfs/go-block-format"
89
"github.com/ipfs/go-cid"
910
ipld "github.com/ipfs/go-ipld-format"
10-
blocks "github.com/ipfs/go-libipfs/blocks"
1111
"golang.org/x/xerrors"
1212

1313
"github.com/filecoin-project/go-state-types/abi"

‎blockstore/sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"sync"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
)
1010

1111
// NewMemorySync returns a thread-safe in-memory blockstore.

‎blockstore/timed.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"sync"
77
"time"
88

9+
blocks "github.com/ipfs/go-block-format"
910
"github.com/ipfs/go-cid"
1011
ipld "github.com/ipfs/go-ipld-format"
11-
blocks "github.com/ipfs/go-libipfs/blocks"
1212
"github.com/raulk/clock"
1313
"go.uber.org/multierr"
1414
)

‎blockstore/timed_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9+
blocks "github.com/ipfs/go-block-format"
910
"github.com/ipfs/go-cid"
10-
blocks "github.com/ipfs/go-libipfs/blocks"
1111
"github.com/raulk/clock"
1212
"github.com/stretchr/testify/require"
1313
)

‎blockstore/union.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package blockstore
33
import (
44
"context"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
78
ipld "github.com/ipfs/go-ipld-format"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
)
1010

1111
type unionBlockstore []Blockstore

‎blockstore/union_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"context"
66
"testing"
77

8-
blocks "github.com/ipfs/go-libipfs/blocks"
8+
blocks "github.com/ipfs/go-block-format"
99
"github.com/stretchr/testify/require"
1010
)
1111

‎chain/events/state/mock/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"sync"
66

7+
blocks "github.com/ipfs/go-block-format"
78
"github.com/ipfs/go-cid"
8-
blocks "github.com/ipfs/go-libipfs/blocks"
99
"golang.org/x/xerrors"
1010

1111
"github.com/filecoin-project/go-address"

‎chain/gen/genesis/genblock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package genesis
33
import (
44
"encoding/hex"
55

6+
blocks "github.com/ipfs/go-block-format"
67
"github.com/ipfs/go-cid"
7-
blocks "github.com/ipfs/go-libipfs/blocks"
88
"github.com/multiformats/go-multihash"
99
)
1010

0 commit comments

Comments
 (0)