Merge pull request #8122 from ipfs/update-libp2p

update go-libp2p to v0.14.0

cmd/ipfs/dnsresolve_test.go

@@ -16,24 +16,26 @@ var (
 	testAddr, _ = ma.NewMultiaddr("/dns4/example.com/tcp/5001")
 )
 
-func makeResolver(n uint8) *madns.Resolver {
+func makeResolver(t *testing.T, n uint8) *madns.Resolver {
 	results := make([]net.IPAddr, n)
 	for i := uint8(0); i < n; i++ {
 		results[i] = net.IPAddr{IP: net.ParseIP(fmt.Sprintf("192.0.2.%d", i))}
 	}
 
-	backend := &madns.MockBackend{
+	backend := &madns.MockResolver{
 		IP: map[string][]net.IPAddr{
 			"example.com": results,
 		}}
 
-	return &madns.Resolver{
-		Backend: backend,
+	resolver, err := madns.NewResolver(madns.WithDefaultResolver(backend))
+	if err != nil {
+		t.Fatal(err)
 	}
+	return resolver
 }
 
 func TestApiEndpointResolveDNSOneResult(t *testing.T) {
-	dnsResolver = makeResolver(1)
+	dnsResolver = makeResolver(t, 1)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if err != nil {
@@ -46,7 +48,7 @@ func TestApiEndpointResolveDNSOneResult(t *testing.T) {
 }
 
 func TestApiEndpointResolveDNSMultipleResults(t *testing.T) {
-	dnsResolver = makeResolver(4)
+	dnsResolver = makeResolver(t, 4)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if err != nil {
@@ -59,7 +61,7 @@ func TestApiEndpointResolveDNSMultipleResults(t *testing.T) {
 }
 
 func TestApiEndpointResolveDNSNoResults(t *testing.T) {
-	dnsResolver = makeResolver(0)
+	dnsResolver = makeResolver(t, 0)
 
 	addr, err := resolveAddr(ctx, testAddr)
 	if addr != nil || err == nil {
@@ -70,3 +72,4 @@ func TestApiEndpointResolveDNSNoResults(t *testing.T) {
 		t.Errorf("expected error not thrown; actual: %v", err)
 	}
 }
+

go.mod

@@ -59,7 +59,7 @@ require (
 	github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
 	github.com/jbenet/go-temp-err-catcher v0.1.0
 	github.com/jbenet/goprocess v0.1.4
-	github.com/libp2p/go-libp2p v0.13.0
+	github.com/libp2p/go-libp2p v0.14.0
 	github.com/libp2p/go-libp2p-circuit v0.4.0
 	github.com/libp2p/go-libp2p-connmgr v0.2.4
 	github.com/libp2p/go-libp2p-core v0.8.5
@@ -69,24 +69,24 @@ require (
 	github.com/libp2p/go-libp2p-kbucket v0.4.7
 	github.com/libp2p/go-libp2p-loggables v0.1.0
 	github.com/libp2p/go-libp2p-mplex v0.4.1
-	github.com/libp2p/go-libp2p-noise v0.1.3
-	github.com/libp2p/go-libp2p-peerstore v0.2.6
+	github.com/libp2p/go-libp2p-noise v0.2.0
+	github.com/libp2p/go-libp2p-peerstore v0.2.7
 	github.com/libp2p/go-libp2p-pubsub v0.4.1
 	github.com/libp2p/go-libp2p-pubsub-router v0.4.0
 	github.com/libp2p/go-libp2p-quic-transport v0.10.0
 	github.com/libp2p/go-libp2p-record v0.1.3
 	github.com/libp2p/go-libp2p-routing-helpers v0.2.3
-	github.com/libp2p/go-libp2p-swarm v0.4.1
+	github.com/libp2p/go-libp2p-swarm v0.5.0
 	github.com/libp2p/go-libp2p-testing v0.4.0
 	github.com/libp2p/go-libp2p-tls v0.1.3
-	github.com/libp2p/go-libp2p-yamux v0.5.1
+	github.com/libp2p/go-libp2p-yamux v0.5.3
 	github.com/libp2p/go-socket-activation v0.0.2
 	github.com/libp2p/go-tcp-transport v0.2.1
 	github.com/libp2p/go-ws-transport v0.4.0
 	github.com/lucas-clemente/quic-go v0.19.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/multiformats/go-multiaddr v0.3.1
-	github.com/multiformats/go-multiaddr-dns v0.2.0
+	github.com/multiformats/go-multiaddr-dns v0.3.1
 	github.com/multiformats/go-multibase v0.0.3
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/opentracing/opentracing-go v1.2.0
@@ -103,7 +103,7 @@ require (
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
+	golang.org/x/sys v0.0.0-20210426080607-c94f62235c83
 )
 
 go 1.14