Small interface changes in dialable.go

Author: qdm12

internal/mdns/dialable.go

@@ -15,8 +15,8 @@ var (
 	ErrTCPListenAddressNotFound = errors.New("TCP listen address not found")
 )
 
-func getMDNSIPsAndPort(p2pHost Networker) (ips []net.IP, port uint16) {
-	tcpAddresses, err := getDialableListenAddrs(p2pHost)
+func getMDNSIPsAndPort(network interfaceListenAddressesGetter) (ips []net.IP, port uint16) {
+	tcpAddresses, err := getDialableListenAddrs(network)
 	if err != nil {
 		const defaultPort = 4001
 		return nil, defaultPort
@@ -31,8 +31,8 @@ func getMDNSIPsAndPort(p2pHost Networker) (ips []net.IP, port uint16) {
 	return ips, port
 }
 
-func getDialableListenAddrs(p2pHost Networker) (tcpAddresses []*net.TCPAddr, err error) {
-	multiAddresses, err := p2pHost.Network().InterfaceListenAddresses()
+func getDialableListenAddrs(network interfaceListenAddressesGetter) (tcpAddresses []*net.TCPAddr, err error) {
+	multiAddresses, err := network.InterfaceListenAddresses()
 	if err != nil {
 		return nil, fmt.Errorf("listing host interface listen addresses: %w", err)
 	}

internal/mdns/interfaces.go

@@ -6,6 +6,7 @@ package mdns
 import (
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/multiformats/go-multiaddr"
 )
 
 // Logger is a logger interface for the mDNS service.
@@ -24,3 +25,8 @@ type IDNetworker interface {
 type Networker interface {
 	Network() network.Network
 }
+
+// interfaceListenAddressesGetter returns the listen addresses of the interfaces.
+type interfaceListenAddressesGetter interface {
+	InterfaceListenAddresses() ([]multiaddr.Multiaddr, error)
+}

internal/mdns/mdns.go

@@ -56,7 +56,7 @@ func (s *Service) Start() (err error) {
 		return nil
 	}
 
-	ips, port := getMDNSIPsAndPort(s.p2pHost)
+	ips, port := getMDNSIPsAndPort(s.p2pHost.Network())
 
 	hostID := s.p2pHost.ID()