explicitly enable autorelay

License: MIT
Signed-off-by: vyzo <vyzo@hackzen.org>

core/core.go

@@ -261,13 +261,16 @@ func (n *IpfsNode) startOnlineServices(ctx context.Context, routingOption Routin
 		libp2pOpts = append(libp2pOpts, libp2p.Transport(quic.NewTransport))
 	}
 
-	// enable routing and autorelay
+	// enable routing
+	libp2pOpts = append(libp2pOpts, libp2p.Routing(func(h p2phost.Host) (routing.PeerRouting, error) {
+		r, err := routingOption(ctx, h, n.Repo.Datastore(), n.RecordValidator)
+		n.Routing = r
+		return r, err
+	}))
+
+	// enable autorelay
 	if cfg.Swarm.EnableAutoRelay {
-		libp2pOpts = append(libp2pOpts, libp2p.Routing(func(h p2phost.Host) (routing.PeerRouting, error) {
-			r, err := routingOption(ctx, h, n.Repo.Datastore(), n.RecordValidator)
-			n.Routing = r
-			return r, err
-		}))
+		libp2pOpts = append(libp2pOpts, libp2p.EnableAutoRelay())
 	}
 
 	peerhost, err := hostOption(ctx, n.Identity, n.Peerstore, libp2pOpts...)
@@ -522,10 +525,8 @@ func (n *IpfsNode) startOnlineServicesWithHost(ctx context.Context, host p2phost
 		n.PubSub = service
 	}
 
-	// this code is necessary as the host is constructed with routing only if autorelay
-	// is enabled.
-	// it is also necessary for tests: mock network constructions ignore the libp2p options
-	// that actually construct the routing!
+	// this code is necessary as the host is necessary for tests: mock network constructions
+	// ignore the libp2p options that actually construct the routing!
 	if n.Routing == nil {
 		r, err := routingOption(ctx, host, n.Repo.Datastore(), n.RecordValidator)
 		if err != nil {