From fa232d8fd6eb32bf006128bf07d27c58a960d646 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Thu, 18 Feb 2021 18:40:36 -0800 Subject: [PATCH 1/2] add a helper function to go directly from a string to an AddrInfo --- peer/addrinfo.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/peer/addrinfo.go b/peer/addrinfo.go index 5cbfe8c3..e0eaa26b 100644 --- a/peer/addrinfo.go +++ b/peer/addrinfo.go @@ -3,6 +3,7 @@ package peer import ( "fmt" + "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr" ) @@ -61,6 +62,15 @@ func SplitAddr(m ma.Multiaddr) (transport ma.Multiaddr, id ID) { return transport, id } +func AddrInfoFromString(s string) (*AddrInfo, error) { + a, err := multiaddr.NewMultiaddr(s) + if err != nil { + return nil, err + } + + return AddrInfoFromP2pAddr(a) +} + // AddrInfoFromP2pAddr converts a Multiaddr to an AddrInfo. func AddrInfoFromP2pAddr(m ma.Multiaddr) (*AddrInfo, error) { transport, id := SplitAddr(m) From f96ed890d601e8cff8a9412b440b18f9c555b1d5 Mon Sep 17 00:00:00 2001 From: Whyrusleeping Date: Thu, 18 Feb 2021 23:04:19 -0800 Subject: [PATCH 2/2] Update peer/addrinfo.go Co-authored-by: Will --- peer/addrinfo.go | 1 + 1 file changed, 1 insertion(+) diff --git a/peer/addrinfo.go b/peer/addrinfo.go index e0eaa26b..3e23c5f4 100644 --- a/peer/addrinfo.go +++ b/peer/addrinfo.go @@ -62,6 +62,7 @@ func SplitAddr(m ma.Multiaddr) (transport ma.Multiaddr, id ID) { return transport, id } +// AddrInfoFromString builds an AddrInfo from the string representation of a Multiaddr func AddrInfoFromString(s string) (*AddrInfo, error) { a, err := multiaddr.NewMultiaddr(s) if err != nil {