Merge pull request #1312 from bysomeone/fix-dht-mdns

dht:manual start mdns service

system/p2p/dht/extension/mdns.go

@@ -30,6 +30,11 @@ func NewMDNS(ctx context.Context, peerhost host.Host, serviceTag string) (*MDNS,
 	notifee := &discoveryNotifee{}
 	notifee.PeerChan = make(chan peer.AddrInfo, 1)
 	ser := discovery.NewMdnsService(peerhost, serviceTag, notifee)
+	err := ser.Start()
+	if err != nil {
+		log.Error("NewMDNS", "start mdns service err", err)
+		return nil, err
+	}
 	mnds := new(MDNS)
 	mnds.Service = ser
 	mnds.notifee = notifee

system/p2p/dht/extension/mdns_test.go

@@ -2,32 +2,26 @@ package extension
 
 import (
 	"context"
-	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
-
-	"github.com/stretchr/testify/require"
 )
 
 func Test_mdns(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	hosts := getNetHosts(3, t)
-	connect(t, hosts[0], hosts[1])
+	hosts := getNetHosts(2, t)
 	_, err := NewMDNS(ctx, hosts[0], "33test123")
 	require.Nil(t, err)
-	_, err = NewMDNS(ctx, hosts[1], "33test123")
-	require.Nil(t, err)
-	tmdns, err := NewMDNS(ctx, hosts[2], "33test123")
+	tmdns, err := NewMDNS(ctx, hosts[1], "33test123")
 	require.Nil(t, err)
 
 	select {
 	case peerinfo := <-tmdns.PeerChan():
-		t.Log("findMdns", peerinfo.ID)
-	case <-time.After(time.Second * 5):
-		return
+		require.Equal(t, hosts[0].ID(), peerinfo.ID)
+	case <-time.After(time.Second * 10):
+		t.Error("mdns discovery failed, timeout")
 	}
-	tmdns.notifee.HandlePeerFound(peer.AddrInfo{})
 
 }

system/p2p/dht/p2p_test.go

@@ -471,5 +471,4 @@ func Test_p2p(t *testing.T) {
 	tcfg.DbPath = filepath.Join(datadir, "addrbook")
 	testAddrbook(t, &tcfg)
 	dhtp2p.reStart()
-	p2p.CloseP2P()
 }