Merge pull request #581 from libp2p/fix/dedup-addresses

fix: dedup addresses

dual/dual.go

@@ -15,6 +15,8 @@ import (
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	helper "github.com/libp2p/go-libp2p-routing-helpers"
 
+	ma "github.com/multiformats/go-multiaddr"
+
 	"github.com/hashicorp/go-multierror"
 )
 
@@ -151,9 +153,22 @@ func (dht *DHT) FindPeer(ctx context.Context, pid peer.ID) (peer.AddrInfo, error
 
 	wg.Wait()
 
+	// combine addresses
+	deduped := make(map[string]ma.Multiaddr, len(wanInfo.Addrs)+len(lanInfo.Addrs))
+	for _, addr := range wanInfo.Addrs {
+		deduped[string(addr.Bytes())] = addr
+	}
+	for _, addr := range lanInfo.Addrs {
+		deduped[string(addr.Bytes())] = addr
+	}
+	addrs := make([]ma.Multiaddr, 0, len(deduped))
+	for _, addr := range deduped {
+		addrs = append(addrs, addr)
+	}
+
 	return peer.AddrInfo{
 		ID:    pid,
-		Addrs: append(wanInfo.Addrs, lanInfo.Addrs...),
+		Addrs: addrs,
 	}, multierror.Append(wanErr, lanErr).ErrorOrNil()
 }
 

dual/dual_test.go

@@ -356,14 +356,14 @@ func TestFindPeer(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(p.Addrs) == 0 {
-		t.Fatal("expeced find peer to find addresses.")
+	if len(p.Addrs) != 1 {
+		t.Fatalf("expeced find peer to find 1 address, found %d", len(p.Addrs))
 	}
 	p, err = d.FindPeer(ctx, wan.PeerID())
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(p.Addrs) == 0 {
-		t.Fatal("expeced find peer to find addresses.")
+	if len(p.Addrs) != 1 {
+		t.Fatalf("expeced find peer to find addresses, found %d", len(p.Addrs))
 	}
 }