[#271] pkg/network: Add multiaddr to ipaddr converter

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-12-23 11:45:36 +03:00 committed by Alex Vanin
parent 2ebcbe70fb
commit a8c26378b1
2 changed files with 13 additions and 10 deletions

View file

@ -113,9 +113,11 @@ func (ap *Processor) findStorageGroups(cid *container.ID, shuffled netmap.Nodes)
zap.Int("total_tries", ln),
)
addr, err := ipAddr(shuffled[i].Address())
addr, err := network.IPAddrFromMultiaddr(shuffled[i].Address())
if err != nil {
log.Warn("can't parse remote address", zap.String("error", err.Error()))
continue
}
cli, err := ap.clientCache.Get(addr)
@ -146,12 +148,3 @@ func (ap *Processor) findStorageGroups(cid *container.ID, shuffled netmap.Nodes)
return sg
}
func ipAddr(multiaddr string) (string, error) {
address, err := network.AddressFromString(multiaddr)
if err != nil {
return "", err
}
return address.IPAddrString()
}