Skip to content

Commit

Permalink
update curio dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@LexLuthr
LexLuthr committed Jan 7, 2025
1 parent 8d029e4 commit f56fe1a
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 84 deletions.
7 changes: 2 additions & 5 deletions cmd/booster-bitswap/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/ipld/go-ipld-prime"
cidlink "github.com/ipld/go-ipld-prime/linking/cid"
"github.com/ipld/go-ipld-prime/traversal"
nilrouting "github.com/libp2p/go-libp2p-routing-helpers"
"github.com/libp2p/go-libp2p/core/host"
mh "github.com/multiformats/go-multihash"

Expand All @@ -21,7 +22,6 @@ import (
lcli "github.com/filecoin-project/lotus/cli"
"github.com/ipfs/boxo/bitswap/client"
bsnetwork "github.com/ipfs/boxo/bitswap/network"
nilrouting "github.com/ipfs/boxo/routing/none"
blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-cid"
ipldlegacy "github.com/ipfs/go-ipld-legacy"
Expand Down Expand Up @@ -96,10 +96,7 @@ var fetchCmd = &cli.Command{
}

// Create a bitswap client
nilRouter, err := nilrouting.ConstructNilRouting(ctx, nil, nil, nil)
if err != nil {
return err
}
nilRouter := nilrouting.Null{}
net := bsnetwork.NewFromIpfsHost(host, nilRouter)
bs, err := blockstore.OpenReadWrite(outputCarPath, []cid.Cid{rootCid}, blockstore.UseWholeCIDs(true))
if err != nil {
Expand Down
7 changes: 2 additions & 5 deletions cmd/booster-bitswap/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
bsnetwork "github.com/ipfs/boxo/bitswap/network"
"github.com/ipfs/boxo/bitswap/server"
blockstore "github.com/ipfs/boxo/blockstore"
nilrouting "github.com/ipfs/boxo/routing/none"
"github.com/ipfs/go-cid"
nilrouting "github.com/libp2p/go-libp2p-routing-helpers"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/peer"
)
Expand Down Expand Up @@ -66,10 +66,7 @@ func (s *BitswapServer) Start(ctx context.Context, proxy *peer.AddrInfo, opts *B
}

// Start a bitswap server on the provider
nilRouter, err := nilrouting.ConstructNilRouting(s.ctx, nil, nil, nil)
if err != nil {
return err
}
nilRouter := nilrouting.Null{}
bsopts := []server.Option{
server.EngineBlockstoreWorkerCount(opts.EngineBlockstoreWorkerCount),
server.EngineTaskWorkerCount(opts.EngineTaskWorkerCount),
Expand Down
44 changes: 21 additions & 23 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/fatih/color v1.16.0
github.com/filecoin-project/boost-graphsync v0.13.12
github.com/filecoin-project/boost/extern/boostd-data v0.0.0-20231124125934-3233c510357f
github.com/filecoin-project/curio v1.23.2-0.20241017101155-587dd6361137
github.com/filecoin-project/curio v1.24.3
github.com/filecoin-project/dagstore v0.7.0
github.com/filecoin-project/go-address v1.2.0
github.com/filecoin-project/go-bitfield v0.2.4
Expand All @@ -50,7 +50,7 @@ require (
github.com/graph-gophers/graphql-transport-ws v0.0.2
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e
github.com/hashicorp/go-multierror v1.1.1
github.com/ipfs/boxo v0.20.0
github.com/ipfs/boxo v0.21.0
github.com/ipfs/go-block-format v0.2.0
github.com/ipfs/go-cid v0.4.1
github.com/ipfs/go-cidutil v0.1.0
Expand All @@ -66,17 +66,17 @@ require (
github.com/ipfs/go-metrics-interface v0.0.1
github.com/ipfs/go-unixfsnode v1.9.0
github.com/ipfs/kubo v0.22.0
github.com/ipld/frisbii v0.4.1
github.com/ipld/frisbii v0.6.1
github.com/ipld/go-car v0.6.2
github.com/ipld/go-car/v2 v2.13.1
github.com/ipld/go-codec-dagpb v1.6.0
github.com/ipld/go-fixtureplate v0.0.2
github.com/ipld/go-fixtureplate v0.0.3
github.com/ipld/go-ipld-prime v0.21.0
github.com/ipld/go-ipld-selector-text-lite v0.0.1
github.com/ipld/go-trustless-utils v0.4.1
github.com/ipld/ipld/specs v0.0.0-20231012031213-54d3b21deda4
github.com/ipni/go-libipni v0.5.2
github.com/ipni/index-provider v0.14.2
github.com/ipni/go-libipni v0.6.13
github.com/ipni/index-provider v0.15.4
github.com/ipni/ipni-cli v0.1.1
github.com/ipni/storetheindex v0.8.1
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
Expand All @@ -86,8 +86,9 @@ require (
github.com/libp2p/go-libp2p v0.37.2
github.com/libp2p/go-libp2p-http v0.5.0
github.com/libp2p/go-libp2p-kad-dht v0.25.2
github.com/libp2p/go-libp2p-pubsub v0.11.0
github.com/libp2p/go-libp2p-pubsub v0.12.0
github.com/libp2p/go-libp2p-record v0.2.0
github.com/libp2p/go-libp2p-routing-helpers v0.7.3
github.com/libp2p/go-msgio v0.3.0
github.com/manifoldco/promptui v0.9.0
github.com/mattn/go-sqlite3 v1.14.16
Expand All @@ -106,7 +107,7 @@ require (
github.com/rs/cors v1.7.0
github.com/schollz/progressbar/v3 v3.14.1
github.com/stretchr/testify v1.10.0
github.com/urfave/cli/v2 v2.25.7
github.com/urfave/cli/v2 v2.27.4
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc
github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11
github.com/whyrusleeping/cbor-gen v0.2.0
Expand All @@ -118,12 +119,12 @@ require (
go.uber.org/fx v1.23.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.29.0
golang.org/x/crypto v0.31.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
golang.org/x/net v0.30.0
golang.org/x/sync v0.9.0
golang.org/x/term v0.26.0
golang.org/x/text v0.20.0
golang.org/x/sync v0.10.0
golang.org/x/term v0.27.0
golang.org/x/text v0.21.0
golang.org/x/tools v0.26.0
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
gopkg.in/cheggaaa/pb.v1 v1.0.28
Expand Down Expand Up @@ -196,7 +197,7 @@ require (
github.com/filecoin-project/specs-actors/v8 v8.0.1 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/gammazero/channelqueue v0.2.1 // indirect
github.com/gammazero/channelqueue v0.2.2 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.2.0 // indirect
Expand All @@ -223,11 +224,9 @@ require (
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.3.0 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
Expand All @@ -242,7 +241,6 @@ require (
github.com/ipfs/go-ds-badger2 v0.1.3 // indirect
github.com/ipfs/go-ds-measure v0.2.0 // indirect
github.com/ipfs/go-fs-lock v0.0.7 // indirect
github.com/ipfs/go-graphsync v0.17.0 // indirect
github.com/ipfs/go-ipfs-blockstore v1.3.1 // indirect
github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
Expand All @@ -254,7 +252,7 @@ require (
github.com/ipfs/go-merkledag v0.11.0 // indirect
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
github.com/ipfs/go-verifcid v0.0.3 // indirect
github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0 // indirect
github.com/ipld/go-ipld-adl-hamt v0.0.0-20240322071803-376decb85801 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.11.0 // indirect
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
Expand Down Expand Up @@ -282,7 +280,6 @@ require (
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
github.com/libp2p/go-libp2p-gostream v0.6.0 // indirect
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
github.com/libp2p/go-libp2p-routing-helpers v0.7.3 // indirect
github.com/libp2p/go-maddr-filter v0.1.0 // indirect
github.com/libp2p/go-nat v0.2.0 // indirect
github.com/libp2p/go-netroute v0.2.1 // indirect
Expand Down Expand Up @@ -348,6 +345,7 @@ require (
github.com/samber/lo v1.39.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/snadrus/must v0.0.0-20240605044437-98cedd57f8eb // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
Expand All @@ -363,8 +361,8 @@ require (
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/wlynxg/anet v0.0.5 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
github.com/yugabyte/gocql v0.0.0-20230831121436-1e2272bb6bb6 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/yugabyte/gocql v1.6.0-yb-1 // indirect
github.com/yugabyte/pgx/v5 v5.5.3-yb-2 // indirect
github.com/zondax/hid v0.9.2 // indirect
github.com/zondax/ledger-filecoin-go v0.11.1 // indirect
Expand All @@ -382,10 +380,10 @@ require (
go.uber.org/mock v0.5.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/time v0.5.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading

0 comments on commit f56fe1a

Please sign in to comment.