Skip to content

Commit

Permalink
chore: upgrade libp2p to v0.32.1
Browse files Browse the repository at this point in the history
Signed-off-by: Norman Meier <[email protected]>
  • Loading branch information
n0izn0iz committed Nov 18, 2023
1 parent 50bfc0e commit 0328419
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 145 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
golang:
- 1.19.x
- 1.20.x
steps:
- uses: actions/checkout@v3
- name: Set up Go
Expand All @@ -24,16 +24,15 @@ jobs:
- name: golangci-lint
uses: golangci/[email protected]
with:
go-version: ${{ matrix.golang }}
version: v1.50.1
version: v1.52.2
args: --timeout=10m

go-tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
golang: ['1.19', '1.20']
os: ['ubuntu-latest', 'macos-latest']
golang: ["1.20", "1.21"]
os: ["ubuntu-latest", "macos-latest"]
env:
OS: ${{ matrix.os }}
GOLANG: ${{ matrix.golang }}
Expand Down
6 changes: 3 additions & 3 deletions db/sqlcipher/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (db *DB) prepareStmts() error {
}

func (db *DB) Register(p peer.ID, ns string, addrs [][]byte, ttl int) (uint64, error) {
pid := p.Pretty()
pid := p.String()
maddrs := packAddrs(addrs)
expire := time.Now().Unix() + int64(ttl)

Expand Down Expand Up @@ -238,7 +238,7 @@ func (db *DB) Register(p peer.ID, ns string, addrs [][]byte, ttl int) (uint64, e
}

func (db *DB) CountRegistrations(p peer.ID) (int, error) {
pid := p.Pretty()
pid := p.String()

row := db.countPeerRegistrations.QueryRow(pid)

Expand All @@ -249,7 +249,7 @@ func (db *DB) CountRegistrations(p peer.ID) (int, error) {
}

func (db *DB) Unregister(p peer.ID, ns string) error {
pid := p.Pretty()
pid := p.String()

var err error

Expand Down
6 changes: 3 additions & 3 deletions db/sqlite/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (db *DB) prepareStmts() error {
}

func (db *DB) Register(p peer.ID, ns string, addrs [][]byte, ttl int) (uint64, error) {
pid := p.Pretty()
pid := p.String()
maddrs := packAddrs(addrs)
expire := time.Now().Unix() + int64(ttl)

Expand Down Expand Up @@ -238,7 +238,7 @@ func (db *DB) Register(p peer.ID, ns string, addrs [][]byte, ttl int) (uint64, e
}

func (db *DB) CountRegistrations(p peer.ID) (int, error) {
pid := p.Pretty()
pid := p.String()

row := db.countPeerRegistrations.QueryRow(pid)

Expand All @@ -249,7 +249,7 @@ func (db *DB) CountRegistrations(p peer.ID) (int, error) {
}

func (db *DB) Unregister(p peer.ID, ns string) error {
pid := p.Pretty()
pid := p.String()

var err error

Expand Down
68 changes: 33 additions & 35 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,84 +1,82 @@
module github.com/berty/go-libp2p-rendezvous

go 1.19
go 1.20

require (
github.com/berty/go-libp2p-mock v1.0.1
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.3.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/libp2p/go-libp2p v0.27.6
github.com/libp2p/go-libp2p v0.32.1
github.com/mattn/go-sqlite3 v1.14.16
github.com/multiformats/go-multiaddr v0.9.0
github.com/multiformats/go-multiaddr v0.12.0
github.com/mutecomm/go-sqlcipher/v4 v4.4.2
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
)

require (
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect
github.com/huin/goupnp v1.1.0 // indirect
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/klauspost/compress v1.16.4 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // 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/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
github.com/libp2p/go-msgio v0.3.0 // indirect
github.com/libp2p/go-nat v0.1.0 // indirect
github.com/libp2p/go-nat v0.2.0 // indirect
github.com/libp2p/go-netroute v0.2.1 // indirect
github.com/mattn/go-isatty v0.0.18 // 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.53 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/miekg/dns v1.1.56 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
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-multicodec v0.8.1 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
github.com/multiformats/go-multihash v0.2.3 // indirect
github.com/multiformats/go-multistream v0.5.0 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/quic-go/quic-go v0.33.0 // indirect
github.com/quic-go/webtransport-go v0.5.2 // 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/spaolacci/murmur3 v1.1.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/mock v0.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/tools v0.7.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
)
Loading

0 comments on commit 0328419

Please sign in to comment.