fix: restore legacy mode detection in resolveNodeMode

Author: martinconic

.github/workflows/beekeeper.yml

@@ -19,7 +19,7 @@ env:
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"
   BEELOCAL_BRANCH: "main"
-  BEEKEEPER_BRANCH: "master"
+  BEEKEEPER_BRANCH: "refactor/node-mode-config"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true
   BATCHFACTOR_OVERRIDE_PUBLIC: 2

cmd/bee/cmd/start.go

@@ -342,46 +342,51 @@ func buildBeeNode(ctx context.Context, c *command, cmd *cobra.Command, logger lo
 }
 
 // resolveNodeMode determines the effective node mode from config.
-// --node-mode takes precedence; the deprecated --full-node flag is honoured as a fallback.
-// It also validates that the required options for each mode are present.
+// --node-mode takes precedence and triggers strict per-mode validation.
+// The deprecated --full-node flag is honoured as a fallback.
+// When neither is set, mode is inferred from blockchain-rpc-endpoint presence
+// (legacy behaviour) without strict validation, for backward compatibility.
 func (c *command) resolveNodeMode(logger log.Logger) (node.NodeMode, error) {
 	rpcEndpoint := c.config.GetString(configKeyBlockchainRpcEndpoint)
 	swapEnable := c.config.GetBool(optionNameSwapEnable)
 
-	// Resolve the mode: explicit node-mode wins, then legacy full-node, then default ultra-light.
-	var mode node.NodeMode
 	if c.config.IsSet(optionNameNodeMode) {
-		mode = node.NodeMode(c.config.GetString(optionNameNodeMode))
+		// Explicit node-mode: validate strictly.
+		mode := node.NodeMode(c.config.GetString(optionNameNodeMode))
 		if !mode.IsValid() {
 			return "", fmt.Errorf("invalid node-mode %q: must be one of full, light, ultra-light", mode)
 		}
-	} else if c.config.GetBool(optionNameFullNode) {
-		logger.Warning("--full-node is deprecated, use --node-mode=full instead")
-		mode = node.FullMode
-	} else {
-		mode = node.UltraLightMode
+		switch mode {
+		case node.FullMode:
+			if rpcEndpoint == "" {
+				return "", errors.New("full node requires blockchain-rpc-endpoint to be set")
+			}
+			if !swapEnable {
+				return "", errors.New("full node requires swap-enable to be true")
+			}
+		case node.LightMode:
+			if rpcEndpoint == "" {
+				return "", errors.New("light node requires blockchain-rpc-endpoint to be set")
+			}
+		case node.UltraLightMode:
+			if swapEnable {
+				return "", errors.New("ultra-light node cannot have swap-enable set to true")
+			}
+		}
+		return mode, nil
 	}
 
-	// Validate mode-specific requirements.
-	switch mode {
-	case node.FullMode:
-		if rpcEndpoint == "" {
-			return "", errors.New("full node requires blockchain-rpc-endpoint to be set")
-		}
-		if !swapEnable {
-			return "", errors.New("full node requires swap-enable to be true")
-		}
-	case node.LightMode:
-		if rpcEndpoint == "" {
-			return "", errors.New("light node requires blockchain-rpc-endpoint to be set")
-		}
-	case node.UltraLightMode:
-		if swapEnable {
-			return "", errors.New("ultra-light node cannot have swap-enable set to true")
-		}
+	// Legacy path: node-mode not set, fall back to deprecated flags / old detection.
+	if c.config.GetBool(optionNameFullNode) {
+		logger.Warning("--full-node is deprecated, use --node-mode=full instead")
+		return node.FullMode, nil
 	}
 
-	return mode, nil
+	// Infer light vs ultra-light from RPC endpoint presence (original behaviour).
+	if rpcEndpoint != "" {
+		return node.LightMode, nil
+	}
+	return node.UltraLightMode, nil
 }
 
 type program struct {