Skip to content

Commit

Permalink
Update dependencies (#2359)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gammazero
gammazero authored Nov 4, 2023
1 parent 7a0825d commit 3138e74
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 103 deletions.
10 changes: 2 additions & 8 deletions assigner/command/daemon.go
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package command

import (
"context"
"errors"
"fmt"
"io"
"os"

"github.com/ipfs/boxo/bootstrap"
"github.com/ipfs/boxo/peering"
logging "github.com/ipfs/go-log/v2"
"github.com/ipfs/kubo/core/bootstrap"
"github.com/ipfs/kubo/peering"
"github.com/ipni/go-libipni/mautil"
"github.com/ipni/storetheindex/assigner/config"
"github.com/ipni/storetheindex/assigner/core"
Expand All @@ -18,7 +17,6 @@ import (
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multiaddr"
"github.com/urfave/cli/v2"
)
Expand Down Expand Up @@ -237,10 +235,6 @@ func startBootstrapper(cfg sticfg.Bootstrap, p2pHost host.Host) (io.Closer, erro
bootCfg := bootstrap.BootstrapConfigWithPeers(addrs)
bootCfg.MinPeerThreshold = cfg.MinimumPeers

// Kubo does not allow these to be nil, so set empty functions.
bootCfg.LoadBackupBootstrapPeers = func(_ context.Context) []peer.AddrInfo { return nil }
bootCfg.SaveBackupBootstrapPeers = func(_ context.Context, _ []peer.AddrInfo) {}

return bootstrap.Bootstrap(p2pHost.ID(), p2pHost, nil, bootCfg)
}

Expand Down
19 changes: 4 additions & 15 deletions command/daemon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

pbl "github.com/cockroachdb/pebble"
"github.com/cockroachdb/pebble/bloom"
"github.com/ipfs/boxo/bootstrap"
"github.com/ipfs/boxo/peering"
"github.com/ipfs/go-datastore"
leveldb "github.com/ipfs/go-ds-leveldb"
logging "github.com/ipfs/go-log/v2"
"github.com/ipfs/kubo/core/bootstrap"
"github.com/ipfs/kubo/peering"
"github.com/ipni/go-indexer-core"
"github.com/ipni/go-indexer-core/cache"
"github.com/ipni/go-indexer-core/cache/radixcache"
Expand All @@ -34,7 +34,6 @@ import (
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/multiformats/go-multiaddr"
"github.com/urfave/cli/v2"
)
Expand Down Expand Up @@ -257,10 +256,6 @@ func daemonAction(cctx *cli.Context) error {
bootCfg := bootstrap.BootstrapConfigWithPeers(addrs)
bootCfg.MinPeerThreshold = cfg.Bootstrap.MinimumPeers

// Kubo does not allow these to be nil, so set empty functions.
bootCfg.LoadBackupBootstrapPeers = func(_ context.Context) []peer.AddrInfo { return nil }
bootCfg.SaveBackupBootstrapPeers = func(_ context.Context, _ []peer.AddrInfo) {}

bootstrapper, err := bootstrap.Bootstrap(peerID, p2pHost, nil, bootCfg)
if err != nil {
return fmt.Errorf("bootstrap failed: %s", err)
Expand Down Expand Up @@ -460,10 +455,7 @@ func daemonAction(cctx *cli.Context) error {
}

if peeringService != nil {
err = peeringService.Stop()
if err != nil {
log.Errorw("Error stopping peering service", "err", err)
}
peeringService.Stop()
}

if ingestSvr != nil {
Expand Down Expand Up @@ -637,10 +629,7 @@ func reloadPeering(cfg config.Peering, peeringService *peering.PeeringService, p
// If no peers are configured, then stop peering service if it is running.
if len(cfg.Peers) == 0 {
if peeringService != nil {
err := peeringService.Stop()
if err != nil {
return nil, fmt.Errorf("error stopping peering service: %w", err)
}
peeringService.Stop()
}
return nil, nil
}
Expand Down
2 changes: 1 addition & 1 deletion command/loadgen/loadgen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func startProviderLoadGen(config Config, indexerHttpAddr string, addressMapping
close = p.announceInBackground()
}
fmt.Println("Started provider load generator")
fmt.Println("Peer ID:", p.h.ID().Pretty())
fmt.Println("Peer ID:", p.h.ID().String())
fmt.Println("Addrs:", p.h.Addrs())
fmt.Println()

Expand Down
2 changes: 1 addition & 1 deletion config/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func CreateIdentity(out io.Writer) (Identity, error) {
if err != nil {
return ident, err
}
ident.PeerID = id.Pretty()
ident.PeerID = id.String()
fmt.Fprintln(out, "peer identity:", ident.PeerID)
return ident, nil
}
53 changes: 28 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ require (
github.com/cockroachdb/pebble v0.0.0-20220726144858-a78491c0086f
github.com/filecoin-project/go-dagaggregator-unixfs v0.3.0
github.com/gammazero/channelqueue v0.2.1
github.com/ipfs/boxo v0.15.0
github.com/ipfs/go-cid v0.4.1
github.com/ipfs/go-datastore v0.6.0
github.com/ipfs/go-ds-leveldb v0.5.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/ipfs/kubo v0.22.0
github.com/ipld/go-car/v2 v2.13.1
github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0
github.com/ipld/go-ipld-prime v0.21.0
github.com/ipld/go-ipld-prime/storage/dsadapter v0.0.0-20230102063945-1a409dc236dd
github.com/ipni/go-indexer-core v0.8.1
github.com/ipni/go-libipni v0.5.4
github.com/libp2p/go-libp2p v0.31.0
github.com/ipni/go-indexer-core v0.8.2
github.com/ipni/go-libipni v0.5.5
github.com/libp2p/go-libp2p v0.32.0
github.com/libp2p/go-msgio v0.3.0
github.com/mitchellh/go-homedir v1.1.0
github.com/multiformats/go-multiaddr v0.11.0
github.com/multiformats/go-multiaddr v0.12.0
github.com/multiformats/go-multicodec v0.9.0
github.com/multiformats/go-multihash v0.2.3
github.com/multiformats/go-varint v0.0.7
Expand All @@ -36,7 +36,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/urfave/cli/v2 v2.25.7
go.opencensus.io v0.24.0
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
golang.org/x/net v0.17.0
golang.org/x/sys v0.13.0
google.golang.org/protobuf v1.31.0
Expand Down Expand Up @@ -87,6 +87,7 @@ require (
github.com/filecoin-project/go-statestore v0.2.0 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/gammazero/radixtree v0.3.1 // indirect
github.com/go-kit/log v0.2.1 // indirect
Expand All @@ -97,11 +98,10 @@ require (
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c // indirect
Expand All @@ -112,11 +112,11 @@ require (
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
github.com/huin/goupnp v1.2.0 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/ipfs/bbloom v0.0.4 // indirect
github.com/ipfs/go-block-format v0.2.0 // indirect
github.com/ipfs/go-blockservice v0.5.1 // indirect
github.com/ipfs/go-graphsync v0.15.1 // indirect
github.com/ipfs/go-graphsync v0.16.0 // indirect
github.com/ipfs/go-ipfs-blockstore v1.3.0 // indirect
github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
Expand All @@ -141,7 +141,7 @@ require (
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
Expand All @@ -150,15 +150,15 @@ require (
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
github.com/libp2p/go-libp2p-pubsub v0.9.3 // indirect
github.com/libp2p/go-libp2p-pubsub v0.10.0 // indirect
github.com/libp2p/go-nat v0.2.0 // indirect
github.com/libp2p/go-netroute v0.2.1 // indirect
github.com/libp2p/go-reuseport v0.4.0 // indirect
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.55 // indirect
github.com/miekg/dns v1.1.56 // indirect
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
Expand All @@ -168,8 +168,8 @@ require (
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
github.com/multiformats/go-multistream v0.5.0 // indirect
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
Expand All @@ -184,9 +184,9 @@ require (
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
github.com/quic-go/quic-go v0.38.1 // indirect
github.com/quic-go/webtransport-go v0.5.3 // indirect
github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
github.com/quic-go/quic-go v0.39.3 // indirect
github.com/quic-go/webtransport-go v0.6.0 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -200,18 +200,21 @@ require (
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.0 // indirect
go.uber.org/fx v1.20.0 // indirect
go.uber.org/dig v1.17.1 // indirect
go.uber.org/fx v1.20.1 // indirect
go.uber.org/mock v0.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 3138e74

Please sign in to comment.