Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Commit 955bcd5

Browse files
lidellidel
committed
refactor: switch to boxo/gateway.NewBlocksGateway
Context: ipfs/boxo#215 Used commits from ipfs/boxo#176 (comment) and filecoin-saturn/caboose#68 to unblock work on #61
1 parent 132a62e commit 955bcd5

11 files changed

+93
-1156
lines changed

‎blockstore.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"time"
99

1010
"github.com/filecoin-saturn/caboose"
11+
blockstore "github.com/ipfs/boxo/blockstore"
12+
exchange "github.com/ipfs/boxo/exchange"
13+
"github.com/ipfs/boxo/gateway"
14+
blocks "github.com/ipfs/go-block-format"
1115
"github.com/ipfs/go-cid"
12-
blockstore "github.com/ipfs/go-ipfs-blockstore"
13-
exchange "github.com/ipfs/go-ipfs-exchange-interface"
14-
blocks "github.com/ipfs/go-libipfs/blocks"
15-
"github.com/ipfs/go-libipfs/gateway"
1616
"go.uber.org/zap/zapcore"
1717
)
1818

‎blockstore_caboose.go

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

1010
"github.com/filecoin-saturn/caboose"
11-
blockstore "github.com/ipfs/go-ipfs-blockstore"
11+
blockstore "github.com/ipfs/boxo/blockstore"
1212
)
1313

1414
const (

‎blockstore_cache.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
format "github.com/ipfs/go-ipld-format"
88
"github.com/prometheus/client_golang/prometheus"
99

10-
blockstore "github.com/ipfs/go-ipfs-blockstore"
11-
"github.com/ipfs/go-libipfs/blocks"
10+
blockstore "github.com/ipfs/boxo/blockstore"
11+
"github.com/ipfs/go-block-format"
1212

1313
lru "github.com/hashicorp/golang-lru/v2"
1414
uatomic "go.uber.org/atomic"

‎blockstore_proxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"net/url"
1111
"time"
1212

13+
blockstore "github.com/ipfs/boxo/blockstore"
14+
"github.com/ipfs/go-block-format"
1315
"github.com/ipfs/go-cid"
14-
blockstore "github.com/ipfs/go-ipfs-blockstore"
15-
"github.com/ipfs/go-libipfs/blocks"
1616
)
1717

1818
// Blockstore backed by a verifiable gateway. This is vendor-agnostic proxy interface,

‎blockstore_test.go

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

9-
"github.com/ipfs/go-libipfs/gateway"
9+
"github.com/ipfs/boxo/gateway"
1010
"github.com/stretchr/testify/assert"
1111
)
1212

‎gateway.go

-218
This file was deleted.

‎go.mod

+20-34
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,19 @@ module github.com/ipfs/bifrost-gateway
33
go 1.19
44

55
require (
6-
github.com/filecoin-saturn/caboose v0.0.0-20230309051244-cd9c1d830e0c
6+
github.com/filecoin-saturn/caboose v0.0.0-20230329130441-83577ee1d402
77
github.com/gogo/protobuf v1.3.2
88
github.com/hashicorp/golang-lru/v2 v2.0.1
9-
github.com/ipfs/go-blockservice v0.5.0
10-
github.com/ipfs/go-cid v0.3.2
11-
github.com/ipfs/go-fetcher v1.6.1
12-
github.com/ipfs/go-ipfs-blockstore v1.2.0
13-
github.com/ipfs/go-ipfs-exchange-interface v0.2.0
9+
github.com/ipfs/boxo v0.8.0-rc2.0.20230329082438-360b031ed895
10+
github.com/ipfs/go-block-format v0.1.2
11+
github.com/ipfs/go-cid v0.4.0
1412
github.com/ipfs/go-ipld-format v0.4.0
15-
github.com/ipfs/go-ipns v0.3.0
16-
github.com/ipfs/go-libipfs v0.6.1-0.20230306084414-15f2131fe190
1713
github.com/ipfs/go-log/v2 v2.5.1
18-
github.com/ipfs/go-merkledag v0.9.0
19-
github.com/ipfs/go-namesys v0.7.0
20-
github.com/ipfs/go-path v0.3.1
21-
github.com/ipfs/go-unixfs v0.3.1
22-
github.com/ipfs/go-unixfsnode v1.5.1
23-
github.com/ipfs/interface-go-ipfs-core v0.11.1
24-
github.com/ipld/go-codec-dagpb v1.5.0
25-
github.com/ipld/go-ipld-prime v0.19.0
26-
github.com/libp2p/go-libp2p v0.25.1
27-
github.com/multiformats/go-multicodec v0.7.0
14+
github.com/libp2p/go-libp2p v0.26.3
2815
github.com/prometheus/client_golang v1.14.0
2916
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417
3017
github.com/spf13/cobra v1.6.1
31-
github.com/stretchr/testify v1.8.1
18+
github.com/stretchr/testify v1.8.2
3219
go.uber.org/atomic v1.10.0
3320
go.uber.org/zap v1.24.0
3421
)
@@ -52,30 +39,30 @@ require (
5239
github.com/hashicorp/go-multierror v1.1.1 // indirect
5340
github.com/hashicorp/golang-lru v0.5.4 // indirect
5441
github.com/inconshreveable/mousetrap v1.0.1 // indirect
55-
github.com/influxdata/tdigest v0.0.1 // indirect
5642
github.com/ipfs/bbloom v0.0.4 // indirect
57-
github.com/ipfs/go-bitfield v1.0.0 // indirect
58-
github.com/ipfs/go-block-format v0.1.1 // indirect
43+
github.com/ipfs/go-bitfield v1.1.0 // indirect
5944
github.com/ipfs/go-datastore v0.6.0 // indirect
60-
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
61-
github.com/ipfs/go-ipfs-files v0.3.0 // indirect
6245
github.com/ipfs/go-ipfs-redirects-file v0.1.1 // indirect
6346
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
6447
github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
6548
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
49+
github.com/ipfs/go-ipns v0.3.0 // indirect
6650
github.com/ipfs/go-log v1.0.5 // indirect
6751
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
68-
github.com/ipfs/go-verifcid v0.0.2 // indirect
69-
github.com/ipld/go-car v0.5.0 // indirect
52+
github.com/ipfs/go-unixfsnode v1.6.0 // indirect
53+
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
54+
github.com/ipld/go-ipld-prime v0.20.0 // indirect
7055
github.com/jbenet/goprocess v0.1.4 // indirect
7156
github.com/klauspost/compress v1.15.15 // indirect
7257
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
7358
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
7459
github.com/libp2p/go-cidranger v1.1.0 // indirect
60+
github.com/libp2p/go-doh-resolver v0.4.0 // indirect
7561
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
76-
github.com/libp2p/go-libp2p-kad-dht v0.21.0 // indirect
62+
github.com/libp2p/go-libp2p-kad-dht v0.21.1 // indirect
7763
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
7864
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
65+
github.com/libp2p/go-libp2p-routing-helpers v0.4.0 // indirect
7966
github.com/libp2p/go-msgio v0.3.0 // indirect
8067
github.com/libp2p/go-netroute v0.2.1 // indirect
8168
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -88,6 +75,7 @@ require (
8875
github.com/multiformats/go-multiaddr v0.8.0 // indirect
8976
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
9077
github.com/multiformats/go-multibase v0.1.1 // indirect
78+
github.com/multiformats/go-multicodec v0.8.1 // indirect
9179
github.com/multiformats/go-multihash v0.2.1 // indirect
9280
github.com/multiformats/go-multistream v0.4.1 // indirect
9381
github.com/multiformats/go-varint v0.0.7 // indirect
@@ -100,7 +88,6 @@ require (
10088
github.com/prometheus/client_model v0.3.0 // indirect
10189
github.com/prometheus/common v0.39.0 // indirect
10290
github.com/prometheus/procfs v0.9.0 // indirect
103-
github.com/rogpeppe/go-internal v1.9.0 // indirect
10491
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b // indirect
10592
github.com/spaolacci/murmur3 v1.1.0 // indirect
10693
github.com/spf13/pflag v1.0.5 // indirect
@@ -109,15 +96,14 @@ require (
10996
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa // indirect
11097
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
11198
go.opencensus.io v0.24.0 // indirect
112-
go.opentelemetry.io/otel v1.12.0 // indirect
113-
go.opentelemetry.io/otel/trace v1.12.0 // indirect
99+
go.opentelemetry.io/otel v1.14.0 // indirect
100+
go.opentelemetry.io/otel/trace v1.14.0 // indirect
114101
go.uber.org/multierr v1.9.0 // indirect
115-
golang.org/x/crypto v0.5.0 // indirect
116-
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
102+
golang.org/x/crypto v0.6.0 // indirect
117103
golang.org/x/mod v0.7.0 // indirect
118-
golang.org/x/net v0.5.0 // indirect
104+
golang.org/x/net v0.7.0 // indirect
119105
golang.org/x/sync v0.1.0 // indirect
120-
golang.org/x/sys v0.4.0 // indirect
106+
golang.org/x/sys v0.6.0 // indirect
121107
golang.org/x/tools v0.5.0 // indirect
122108
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
123109
google.golang.org/protobuf v1.28.1 // indirect

0 commit comments

Comments
 (0)