Merge pull request #32 from libp2p/fix/nil-addr

avoid putting nil multadders in the PeerInfo
libp2p · Mar 12, 2018 · 4b73875 · 4b73875
2 parents 3f04cba + 5e68d0d
commit 4b73875
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/p2p/protocol/internal/circuitv1-deprecated/util.go b/p2p/protocol/internal/circuitv1-deprecated/util.go
@@ -25,11 +25,11 @@ func peerToPeerInfo(p *pb.CircuitRelay_Peer) (pstore.PeerInfo, error) {
 		return pstore.PeerInfo{}, err
 	}
 
-	addrs := make([]ma.Multiaddr, len(p.Addrs))
-	for i := 0; i < len(addrs); i++ {
-		a, err := ma.NewMultiaddrBytes(p.Addrs[i])
+	addrs := make([]ma.Multiaddr, 0, len(p.Addrs))
+	for _, addrBytes := range p.Addrs {
+		a, err := ma.NewMultiaddrBytes(addrBytes)
 		if err == nil {
-			addrs[i] = a
+			addrs = append(addrs, a)
 		}
 	}
 
@@ -38,8 +38,8 @@ func peerToPeerInfo(p *pb.CircuitRelay_Peer) (pstore.PeerInfo, error) {
 
 func peerInfoToPeer(pi pstore.PeerInfo) *pb.CircuitRelay_Peer {
 	addrs := make([][]byte, len(pi.Addrs))
-	for i := 0; i < len(addrs); i++ {
-		addrs[i] = pi.Addrs[i].Bytes()
+	for i, addr := range pi.Addrs {
+		addrs[i] = addr.Bytes()
 	}
 
 	p := new(pb.CircuitRelay_Peer)