Merge pull request #710 from libp2p/fix-staticcheck

various staticcheck fixes

dht_filters.go

@@ -197,6 +197,7 @@ func isEUI(ip net.IP) bool {
 }
 
 func sameV6Net(a, b net.IP) bool {
+	//lint:ignore SA1021 We're comparing only parts of the IP address here.
 	return len(a) == net.IPv6len && len(b) == net.IPv6len && bytes.Equal(a[0:8], b[0:8]) //nolint
 }
 

dht_filters_test.go

@@ -8,21 +8,20 @@ import (
 	ic "github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/multiformats/go-multiaddr"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 func TestIsRelay(t *testing.T) {
-	a, _ := multiaddr.NewMultiaddr("/ip4/127.0.0.1/tcp/5002/p2p/QmdPU7PfRyKehdrP5A3WqmjyD6bhVpU1mLGKppa2FjGDjZ/p2p-circuit/p2p/QmVT6GYwjeeAF5TR485Yc58S3xRF5EFsZ5YAF4VcP3URHt")
+	a, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5002/p2p/QmdPU7PfRyKehdrP5A3WqmjyD6bhVpU1mLGKppa2FjGDjZ/p2p-circuit/p2p/QmVT6GYwjeeAF5TR485Yc58S3xRF5EFsZ5YAF4VcP3URHt")
 	if !isRelayAddr(a) {
 		t.Fatalf("thought %s was not a relay", a)
 	}
-	a, _ = multiaddr.NewMultiaddr("/p2p-circuit/p2p/QmVT6GYwjeeAF5TR485Yc58S3xRF5EFsZ5YAF4VcP3URHt")
+	a, _ = ma.NewMultiaddr("/p2p-circuit/p2p/QmVT6GYwjeeAF5TR485Yc58S3xRF5EFsZ5YAF4VcP3URHt")
 	if !isRelayAddr(a) {
 		t.Fatalf("thought %s was not a relay", a)
 	}
-	a, _ = multiaddr.NewMultiaddr("/ip4/127.0.0.1/tcp/5002/p2p/QmdPU7PfRyKehdrP5A3WqmjyD6bhVpU1mLGKppa2FjGDjZ")
+	a, _ = ma.NewMultiaddr("/ip4/127.0.0.1/tcp/5002/p2p/QmdPU7PfRyKehdrP5A3WqmjyD6bhVpU1mLGKppa2FjGDjZ")
 	if isRelayAddr(a) {
 		t.Fatalf("thought %s was a relay", a)
 	}

routing.go

@@ -327,10 +327,10 @@ func (dht *IpfsDHT) getValues(ctx context.Context, key string, stopQuery chan st
 						ID:   p,
 					})
 					return nil, err
-				default:
-					return nil, err
 				case nil, internal.ErrInvalidRecord:
 					// in either of these cases, we want to keep going
+				default:
+					return nil, err
 				}
 
 				// TODO: What should happen if the record is invalid?