From d2d7433a50681908dff74ebe301842e72bbac081 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 21 Sep 2021 11:12:35 +0100 Subject: [PATCH] use the changed Transport.Protocols method --- go.mod | 4 ++-- go.sum | 12 ++++-------- suites/transport/transport_suite.go | 12 ++++++------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 15b6ecc..3953990 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/libp2p/go-libp2p-testing go 1.16 require ( - github.com/libp2p/go-libp2p-core v0.10.0 - github.com/multiformats/go-multiaddr v0.3.1 + github.com/libp2p/go-libp2p-core v0.10.1-0.20210921170543-f829c09c1ca0 + github.com/multiformats/go-multiaddr v0.4.1 go.uber.org/atomic v1.6.0 google.golang.org/grpc v1.31.1 ) diff --git a/go.sum b/go.sum index dd0b0f9..b063829 100644 --- a/go.sum +++ b/go.sum @@ -42,9 +42,8 @@ github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6 github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs= -github.com/libp2p/go-libp2p-core v0.10.0 h1:jFy7v5Muq58GTeYkPhGzIH8Qq4BFfziqc0ixPd/pP9k= -github.com/libp2p/go-libp2p-core v0.10.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg= -github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU= +github.com/libp2p/go-libp2p-core v0.10.1-0.20210921170543-f829c09c1ca0 h1:W1EqIm0+QVnfQ2SV138//D9NyAhseDxqLMoWvvhYsQQ= +github.com/libp2p/go-libp2p-core v0.10.1-0.20210921170543-f829c09c1ca0/go.mod h1:KlkHsZ0nKerWsXLZJm3LfFQwusI5k3iN4BgtYTE4IYE= github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA= github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw= github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= @@ -61,11 +60,8 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= -github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y= -github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI= -github.com/multiformats/go-multiaddr v0.3.1 h1:1bxa+W7j9wZKTZREySx1vPMs2TqrYWjVZ7zE6/XLG1I= -github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc= -github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA= +github.com/multiformats/go-multiaddr v0.4.1 h1:Pq37uLx3hsyNlTDir7FZyU8+cFCTqd5y1KiM2IzOutI= +github.com/multiformats/go-multiaddr v0.4.1/go.mod h1:3afI9HfVW8csiF8UZqtpYRiDyew8pRX7qLIGHu9FLuM= github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= diff --git a/suites/transport/transport_suite.go b/suites/transport/transport_suite.go index 6e6b300..bef5d98 100644 --- a/suites/transport/transport_suite.go +++ b/suites/transport/transport_suite.go @@ -16,27 +16,27 @@ import ( var testData = []byte("this is some test data") -func SubtestProtocols(t *testing.T, ta, tb transport.Transport, maddr ma.Multiaddr, peerA peer.ID) { +func SubtestProtocols(t *testing.T, ta, tb transport.Transport, maddr ma.Multiaddr, _ peer.ID) { rawIPAddr, _ := ma.NewMultiaddr("/ip4/1.2.3.4") if ta.CanDial(rawIPAddr) || tb.CanDial(rawIPAddr) { t.Error("nothing should be able to dial raw IP") } - tprotos := make(map[int]bool) + tprotos := make(map[int]struct{}) for _, p := range ta.Protocols() { - tprotos[p] = true + tprotos[p.Code] = struct{}{} } if !ta.Proxy() { protos := maddr.Protocols() proto := protos[len(protos)-1] - if !tprotos[proto.Code] { + if _, ok := tprotos[proto.Code]; !ok { t.Errorf("transport should have reported that it supports protocol '%s' (%d)", proto.Name, proto.Code) } } else { - found := false + var found bool for _, proto := range maddr.Protocols() { - if tprotos[proto.Code] { + if _, ok := tprotos[proto.Code]; !ok { found = true break }