refactor: node mode two regimes

cmd/bee/cmd/cmd.go

@@ -57,11 +57,12 @@ const (
 	optionNameBzzTokenAddress              = "bzz-token-address"
 	optionNameSwapFactoryAddress           = "swap-factory-address"
 	optionNameSwapInitialDeposit           = "swap-initial-deposit"
+	optionNameNodeMode                     = "node-mode"
 	optionNameSwapEnable                   = "swap-enable"
 	optionNameChequebookEnable             = "chequebook-enable"
 	optionNameChequebookVerification       = "chequebook-verification"
 	optionNameChequebookMinBalance         = "chequebook-min-balance"
-	optionNameFullNode                     = "full-node"
+	optionNameFullNode                     = "full-node" // Deprecated: use node-mode instead.
 	optionNameLightNodeLimit               = "light-node-limit"
 	optionNamePostageContractAddress       = "postage-stamp-address"
 	optionNamePostageContractStartBlock    = "postage-stamp-start-block"
@@ -360,11 +361,13 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory addresses")
 	cmd.Flags().String(optionNameBzzTokenAddress, "", "bzz token contract address")
 	cmd.Flags().String(optionNameSwapInitialDeposit, "0", "initial deposit if deploying a new chequebook")
+	cmd.Flags().String(optionNameNodeMode, "", "node operational mode: full, light, or ultra-light (unset: inferred from deprecated full-node and blockchain-rpc-endpoint)")
 	cmd.Flags().Bool(optionNameSwapEnable, false, "enable swap")
 	cmd.Flags().Bool(optionNameChequebookEnable, true, "enable chequebook")
 	cmd.Flags().Bool(optionNameChequebookVerification, false, "reject full-node hive/handshake records that carry no chequebook address")
 	cmd.Flags().String(optionNameChequebookMinBalance, "110000000000000000", "minimum chequebook token balance required for verification, in token small units (default 11 BZZ)")
-	cmd.Flags().Bool(optionNameFullNode, false, "cause the node to start in full mode")
+	cmd.Flags().Bool(optionNameFullNode, false, "cause the node to start in full mode (deprecated: use --node-mode=full)")
+	_ = cmd.Flags().MarkDeprecated(optionNameFullNode, "use --node-mode=full instead")
 	cmd.Flags().Int(optionNameLightNodeLimit, 100, "light node limit")
 	cmd.Flags().String(optionNamePostageContractAddress, "", "postage stamp contract address")
 	cmd.Flags().Uint64(optionNamePostageContractStartBlock, 0, "postage stamp contract start block number")

cmd/bee/cmd/export_test.go

@@ -7,7 +7,10 @@ package cmd
 import (
 	"io"
 
+	"github.com/ethersphere/bee/v2/pkg/log"
+	"github.com/ethersphere/bee/v2/pkg/node"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 type (
@@ -89,3 +92,54 @@ func WithPasswordReader(r PasswordReader) func(c *Command) {
 func (c *Command) SetCfgFileForTest(f string) {
 	c.cfgFile = f
 }
+
+// Config keys read by node-mode resolution.
+const (
+	OptionNameNodeMode                = optionNameNodeMode
+	OptionNameFullNode                = optionNameFullNode
+	OptionNameBootnodeMode            = optionNameBootnodeMode
+	OptionNameSwapEnable              = optionNameSwapEnable
+	OptionNameChequebookEnable        = optionNameChequebookEnable
+	OptionNameStorageIncentivesEnable = optionNameStorageIncentivesEnable
+	OptionNameChequebookVerification  = optionNameChequebookVerification
+	OptionNameReserveCapacityDoubling = optionReserveCapacityDoubling
+	ConfigKeyBlockchainRpcEndpoint    = configKeyBlockchainRpcEndpoint
+)
+
+// ResolveNodeModeForTest runs node-mode resolution against cfg, leaving the
+// resolved option values in cfg.
+func ResolveNodeModeForTest(cfg *viper.Viper) (node.NodeMode, error) {
+	return ResolveNodeModeWithLoggerForTest(cfg, log.Noop)
+}
+
+// ResolveNodeModeWithLoggerForTest is ResolveNodeModeForTest with a logger, for
+// tests that assert on the warnings resolution emits.
+func ResolveNodeModeWithLoggerForTest(cfg *viper.Viper, logger log.Logger) (node.NodeMode, error) {
+	c := &command{config: cfg, logger: logger}
+	return c.resolveNodeMode(c.logger)
+}
+
+// BindStartFlagsForTest mirrors the start command's PreRunE: it binds cfg to
+// the command flags, then maps the flat blockchain-rpc-* flags onto their
+// nested config keys.
+func BindStartFlagsForTest(cfg *viper.Viper, startCmd *cobra.Command) error {
+	if err := cfg.BindPFlags(startCmd.Flags()); err != nil {
+		return err
+	}
+	c := &command{config: cfg}
+	c.bindBlockchainRpcConfig(startCmd)
+	return nil
+}
+
+// LegacyMigrationForTest resolves a config without node-mode through the
+// production path and returns the inferred mode with the migration the
+// deprecation warning lists.
+func LegacyMigrationForTest(cfg *viper.Viper) (mode node.NodeMode, set, remove, notes []string, err error) {
+	c := &command{config: cfg, logger: log.Noop}
+	mode, err = c.resolveNodeMode(c.logger)
+	if err != nil {
+		return "", nil, nil, nil, err
+	}
+	m := c.legacyMigration(mode)
+	return mode, m.set, m.remove, m.notes, nil
+}