return and log dht.Close() error

network/p2p/capabilities.go

@@ -67,9 +67,10 @@ func (c *CapabilitiesDiscovery) FindPeers(ctx context.Context, ns string, opts .
 }
 
 // Close should be called when fully shutting down the node
-func (c *CapabilitiesDiscovery) Close() {
-	_ = c.dht.Close()
+func (c *CapabilitiesDiscovery) Close() error {
+	err := c.dht.Close()
 	c.wg.Wait()
+	return err
 }
 
 // Host exposes the underlying libp2p host.Host object

network/p2p/capabilities_test.go

@@ -309,7 +309,8 @@ func TestCapabilities_Varying(t *testing.T) {
 			wg.Wait()
 
 			for _, disc := range capsDisc[3:] {
-				disc.Close()
+				err := disc.Close()
+				require.NoError(t, err)
 				// Make sure it actually closes
 				disc.wg.Wait()
 			}
@@ -347,6 +348,7 @@ func TestCapabilities_ExcludesSelf(t *testing.T) {
 		"Found self when searching for capability",
 	)
 
-	disc[0].Close()
+	err := disc[0].Close()
+	require.NoError(t, err)
 	disc[0].wg.Wait()
 }

network/p2pNetwork.go

@@ -365,7 +365,10 @@ func (n *P2PNetwork) Start() error {
 // Stop closes sockets and stop threads.
 func (n *P2PNetwork) Stop() {
 	if n.capabilitiesDiscovery != nil {
-		n.capabilitiesDiscovery.Close()
+		err := n.capabilitiesDiscovery.Close()
+		if err != nil {
+			n.log.Warnf("Error closing capabilities discovery: %v", err)
+		}
 	}
 
 	n.handler.ClearHandlers([]Tag{})