docs: improved deprecation messages

Author: lidel

core/node/groups.go

@@ -119,30 +119,30 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
 
 	// Log error when relay subsystem could not be initialized due to missing dependency
 	if !enableRelayTransport {
-		if cfg.Swarm.RelayService.Enabled.WithDefault(true) {
-			logger.Fatal("Failed to enable `Swarm.RelayService.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
+		if enableRelayService {
+			logger.Fatal("Failed to enable `Swarm.RelayService`, it requires `Swarm.Transports.Network.Relay` to be true.")
 		}
-		if cfg.Swarm.RelayClient.Enabled.WithDefault(true) {
-			logger.Fatal("Failed to enable `Swarm.RelayClient.Enabled`, it requires `Swarm.Transports.Network.Relay` to be true.")
+		if enableRelayClient {
+			logger.Fatal("Failed to enable `Swarm.RelayClient`, it requires `Swarm.Transports.Network.Relay` to be true.")
 		}
 	}
 
 	// Force users to migrate old config.
 	// nolint
 	if cfg.Swarm.DisableRelay {
-		logger.Fatal("The 'Swarm.DisableRelay' (Relay V1) config field was removed." +
-			"Use the 'Swarm.Transports.Network.Relay' (V2) instead.")
+		logger.Fatal("The 'Swarm.DisableRelay' config field was removed." +
+			"Use the 'Swarm.Transports.Network.Relay' instead.")
 	}
 	// nolint
 	if cfg.Swarm.EnableAutoRelay {
-		logger.Fatal("The 'Swarm.EnableAutoRelay' (Relay V1) config field was removed." +
-			"Use the 'Swarm.RelayClient.Enabled' (V2) instead.")
+		logger.Fatal("The 'Swarm.EnableAutoRelay' config field was removed." +
+			"Use the 'Swarm.RelayClient.Enabled' instead.")
 	}
 	// nolint
 	if cfg.Swarm.EnableRelayHop {
 		logger.Fatal("The `Swarm.EnableRelayHop` config field was removed.\n" +
 			"Use `Swarm.RelayService` to configure the circuit v2 relay.\n" +
-			"If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://github.com/libp2p/go-libp2p-relay-daemon (with RelayV1.Enabled: true)")
+			"If you want to continue running a circuit v1 relay, please use the standalone relay daemon: https://dist.ipfs.io/#libp2p-relay-daemon (with RelayV1.Enabled: true)")
 	}
 
 	peerChan := make(chan peer.AddrInfo)

core/node/libp2p/relay.go

@@ -71,7 +71,7 @@ func HolePunching(flag config.Flag, hasRelayClient bool) func() (opts Libp2pOpts
 	return func() (opts Libp2pOpts, err error) {
 		if flag.WithDefault(true) {
 			if !hasRelayClient {
-				log.Error("Failed to enable `Swarm.EnableHolePunching`, it requires `Swarm.RelayClient.Enabled` to be true.")
+				log.Fatal("Failed to enable `Swarm.EnableHolePunching`, it requires `Swarm.RelayClient.Enabled` to be true.")
 				return
 			}
 			opts.Opts = append(opts.Opts, libp2p.EnableHolePunching())