Addressed reviews
This commit is contained in:
parent
eba6efd457
commit
e6d183fd70
14
api/util.go
14
api/util.go
|
@ -2,7 +2,6 @@ package api
|
|||
|
||||
import (
|
||||
peer "github.com/libp2p/go-libp2p-core/peer"
|
||||
ma "github.com/multiformats/go-multiaddr"
|
||||
)
|
||||
|
||||
// PeersToStrings IDB58Encodes a list of peers.
|
||||
|
@ -29,16 +28,3 @@ func StringsToPeers(strs []string) []peer.ID {
|
|||
}
|
||||
return peers
|
||||
}
|
||||
|
||||
// MustLibp2pMultiaddrJoin takes a LibP2P multiaddress and a peer ID and
|
||||
// encapsulates a new /ipfs/<peerID> address. It will panic if the given
|
||||
// peer ID is bad.
|
||||
func MustLibp2pMultiaddrJoin(addr Multiaddr, p peer.ID) Multiaddr {
|
||||
v := addr.Value()
|
||||
pidAddr, err := ma.NewMultiaddr("/ipfs/" + peer.IDB58Encode(p))
|
||||
// let this break badly
|
||||
if err != nil {
|
||||
panic("called MustLibp2pMultiaddrJoin with bad peer!")
|
||||
}
|
||||
return Multiaddr{Multiaddr: v.Encapsulate(pidAddr)}
|
||||
}
|
||||
|
|
19
cluster.go
19
cluster.go
|
@ -721,22 +721,11 @@ func (c *Cluster) ID(ctx context.Context) *api.ID {
|
|||
Error: err.Error(),
|
||||
}
|
||||
}
|
||||
|
||||
var addrs []api.Multiaddr
|
||||
|
||||
addrsSet := make(map[string]struct{}) // to filter dups
|
||||
for _, addr := range c.host.Addrs() {
|
||||
addrsSet[addr.String()] = struct{}{}
|
||||
}
|
||||
|
||||
var addrSorted []string
|
||||
for k := range addrsSet {
|
||||
addrSorted = append(addrSorted, k)
|
||||
}
|
||||
sort.Strings(addrSorted)
|
||||
|
||||
for _, k := range addrSorted {
|
||||
addr, _ := api.NewMultiaddr(k)
|
||||
addrs = append(addrs, api.MustLibp2pMultiaddrJoin(addr, c.id))
|
||||
mAddrs, _ := peer.AddrInfoToP2pAddrs(&peer.AddrInfo{ID: c.id, Addrs: c.host.Addrs()})
|
||||
for _, mAddr := range mAddrs {
|
||||
addrs = append(addrs, api.NewMultiaddrWithValue(mAddr))
|
||||
}
|
||||
|
||||
peers := []peer.ID{}
|
||||
|
|
|
@ -15,7 +15,7 @@ import (
|
|||
"time"
|
||||
|
||||
logging "github.com/ipfs/go-log"
|
||||
"github.com/ipfs/ipfs-cluster/utils"
|
||||
utils "github.com/ipfs/ipfs-cluster/utils"
|
||||
host "github.com/libp2p/go-libp2p-core/host"
|
||||
net "github.com/libp2p/go-libp2p-core/network"
|
||||
peer "github.com/libp2p/go-libp2p-core/peer"
|
||||
|
@ -140,7 +140,6 @@ func (pm *Manager) filteredPeerAddrs(p peer.ID) []ma.Multiaddr {
|
|||
}
|
||||
|
||||
if len(peerDNSAddrs) > 0 {
|
||||
sort.Sort(utils.ByString(peerDNSAddrs))
|
||||
return peerDNSAddrs
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user