fix test; better naming

tools/cosmovisor/args_test.go

@@ -477,6 +477,7 @@ var newConfig = func(
 		CustomPreUpgrade:         customPreUpgrade,
 		DisableRecase:            disableRecase,
 		ShutdownGrace:            time.Duration(shutdownGrace),
+		CometBftRpcEndpoint:      "http://localhost:26657",
 	}
 }
 

tools/cosmovisor/cmd/cosmovisor/add_upgrade.go

@@ -28,8 +28,8 @@ func NewAddUpgradeCmd() *cobra.Command {
 	return addUpgrade
 }
 
-// AddUpgrade adds upgrade info to manifest
-func AddUpgrade(cfg *cosmovisor.Config, force bool, upgradeHeight int64, upgradeName, executablePath, upgradeInfoPath string) error {
+// addUpgrade adds upgrade info to manifest
+func addUpgrade(cfg *cosmovisor.Config, force bool, upgradeHeight int64, upgradeName, executablePath, upgradeInfoPath string) error {
 	logger := cfg.Logger(os.Stdout)
 
 	if !cfg.DisableRecase {
@@ -86,7 +86,7 @@ func AddUpgrade(cfg *cosmovisor.Config, force bool, upgradeHeight int64, upgrade
 }
 
 // GetConfig returns a Config using passed-in flag
-func GetConfig(cmd *cobra.Command) (*cosmovisor.Config, error) {
+func getConfigFromCmd(cmd *cobra.Command) (*cosmovisor.Config, error) {
 	configPath, err := cmd.Flags().GetString(cosmovisor.FlagCosmovisorConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get config flag: %w", err)
@@ -101,7 +101,7 @@ func GetConfig(cmd *cobra.Command) (*cosmovisor.Config, error) {
 
 // AddUpgradeCmd parses input flags and adds upgrade info to manifest
 func AddUpgradeCmd(cmd *cobra.Command, args []string) error {
-	cfg, err := GetConfig(cmd)
+	cfg, err := getConfigFromCmd(cmd)
 	if err != nil {
 		return err
 	}
@@ -118,7 +118,7 @@ func AddUpgradeCmd(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to get upgrade-height flag: %w", err)
 	}
 
-	return AddUpgrade(cfg, force, upgradeHeight, upgradeName, executablePath, cfg.UpgradeInfoFilePath())
+	return addUpgrade(cfg, force, upgradeHeight, upgradeName, executablePath, cfg.UpgradeInfoFilePath())
 }
 
 // saveOrAbort saves data to path or aborts if file exists and force is false

tools/cosmovisor/cmd/cosmovisor/batch_upgrade.go

@@ -24,7 +24,7 @@ func NewBatchAddUpgradeCmd() *cobra.Command {
 // AddBatchUpgrade takes in multiple specified upgrades and creates a single
 // batch upgrade file out of them
 func AddBatchUpgrade(cmd *cobra.Command, args []string) error {
-	cfg, err := GetConfig(cmd)
+	cfg, err := getConfigFromCmd(cmd)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func AddBatchUpgrade(cmd *cobra.Command, args []string) error {
 		}
 		upgradeInfoPath := filepath.Join(cfg.UpgradeInfoFilePath(), upgradeName)
 		upgradeInfoPaths = append(upgradeInfoPaths, upgradeInfoPath)
-		if err := AddUpgrade(cfg, true, upgradeHeight, upgradeName, upgradePath, upgradeInfoPath); err != nil {
+		if err := addUpgrade(cfg, true, upgradeHeight, upgradeName, upgradePath, upgradeInfoPath); err != nil {
 			return err
 		}
 	}

tools/cosmovisor/process.go

@@ -62,10 +62,10 @@ func loadBatchUpgradeFile(cfg *Config) ([]upgradetypes.Plan, error) {
 	return uInfos, nil
 }
 
-// BatchWatcher starts a watcher loop that swaps upgrade manifests at the correct
+// BatchUpgradeWatcher starts a watcher loop that swaps upgrade manifests at the correct
 // height, given the batch upgrade file. It watches the current state of the chain
 // via the websocket API.
-func BatchWatcher(ctx context.Context, cfg *Config, logger log.Logger) {
+func BatchUpgradeWatcher(ctx context.Context, cfg *Config, logger log.Logger) {
 	// load batch file in memory
 	uInfos, err := loadBatchUpgradeFile(cfg)
 	if err != nil {
@@ -211,7 +211,7 @@ func (l Launcher) Run(args []string, stdin io.Reader, stdout, stderr io.Writer)
 		}
 	}()
 
-	go BatchWatcher(ctx, l.cfg, l.logger)
+	go BatchUpgradeWatcher(ctx, l.cfg, l.logger)
 
 	if needsUpdate, err := l.WaitForUpgradeOrExit(cmd); err != nil || !needsUpdate {
 		return false, err