From ba0d61d4bcf15900239d260061f62dce7509954b Mon Sep 17 00:00:00 2001 From: Virgil Date: Sat, 4 Apr 2026 05:43:20 +0000 Subject: [PATCH] Align CLI manager naming with AX --- cmd/mining/cmd/install.go | 2 +- cmd/mining/cmd/list.go | 2 +- cmd/mining/cmd/root.go | 18 +++++++++--------- cmd/mining/cmd/serve.go | 4 ++-- cmd/mining/cmd/start.go | 2 +- cmd/mining/cmd/status.go | 2 +- cmd/mining/cmd/stop.go | 2 +- cmd/mining/cmd/uninstall.go | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmd/mining/cmd/install.go b/cmd/mining/cmd/install.go index 772925b..78a580e 100644 --- a/cmd/mining/cmd/install.go +++ b/cmd/mining/cmd/install.go @@ -65,7 +65,7 @@ var installCmd = &cobra.Command{ } func updateDoctorCache() error { - manager := getServiceManager() + manager := getManager() availableMiners := manager.ListAvailableMiners() if len(availableMiners) == 0 { return nil diff --git a/cmd/mining/cmd/list.go b/cmd/mining/cmd/list.go index f12a831..b5b89a2 100644 --- a/cmd/mining/cmd/list.go +++ b/cmd/mining/cmd/list.go @@ -12,7 +12,7 @@ var listCmd = &cobra.Command{ Short: "List running and available miners", Long: `List all running miners and their status, as well as all miners that are available to be installed and started.`, RunE: func(cmd *cobra.Command, args []string) error { - manager := getServiceManager() + manager := getManager() // List running miners runningMiners := manager.ListMiners() diff --git a/cmd/mining/cmd/root.go b/cmd/mining/cmd/root.go index 185d161..76a345c 100644 --- a/cmd/mining/cmd/root.go +++ b/cmd/mining/cmd/root.go @@ -8,7 +8,7 @@ import ( ) var ( - serviceManager *mining.Manager + manager *mining.Manager ) var rootCmd = &cobra.Command{ @@ -24,21 +24,21 @@ func Execute() error { } func init() { - cobra.OnInitialize(initializeServiceManager) + cobra.OnInitialize(initializeManager) } -func initializeServiceManager() { +func initializeManager() { if len(os.Args) > 1 && os.Args[1] == "simulate" { return } - if serviceManager == nil { - serviceManager = mining.NewManager() + if manager == nil { + manager = mining.NewManager() } } -func getServiceManager() *mining.Manager { - if serviceManager == nil { - serviceManager = mining.NewManager() +func getManager() *mining.Manager { + if manager == nil { + manager = mining.NewManager() } - return serviceManager + return manager } diff --git a/cmd/mining/cmd/serve.go b/cmd/mining/cmd/serve.go index 7f21b2e..4d8232a 100644 --- a/cmd/mining/cmd/serve.go +++ b/cmd/mining/cmd/serve.go @@ -42,8 +42,8 @@ var serveCmd = &cobra.Command{ displayAddress := fmt.Sprintf("%s:%d", displayHostName, port) listenAddress := fmt.Sprintf("%s:%d", host, port) - // manager := getServiceManager() shares the same miner lifecycle state across CLI commands. - manager := getServiceManager() + // manager := getManager() shares the same miner lifecycle state across CLI commands. + manager := getManager() service, err := mining.NewService(manager, listenAddress, displayAddress, namespace) if err != nil { diff --git a/cmd/mining/cmd/start.go b/cmd/mining/cmd/start.go index 98a4e8c..d68aca4 100644 --- a/cmd/mining/cmd/start.go +++ b/cmd/mining/cmd/start.go @@ -26,7 +26,7 @@ var startCmd = &cobra.Command{ Wallet: walletAddress, } - miner, err := getServiceManager().StartMiner(context.Background(), minerType, config) + miner, err := getManager().StartMiner(context.Background(), minerType, config) if err != nil { return fmt.Errorf("failed to start miner: %w", err) } diff --git a/cmd/mining/cmd/status.go b/cmd/mining/cmd/status.go index 08d0ea6..6d24757 100644 --- a/cmd/mining/cmd/status.go +++ b/cmd/mining/cmd/status.go @@ -17,7 +17,7 @@ var statusCmd = &cobra.Command{ Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { minerName := args[0] - manager := getServiceManager() + manager := getManager() miner, err := manager.GetMiner(minerName) if err != nil { diff --git a/cmd/mining/cmd/stop.go b/cmd/mining/cmd/stop.go index bebda08..93e5066 100644 --- a/cmd/mining/cmd/stop.go +++ b/cmd/mining/cmd/stop.go @@ -15,7 +15,7 @@ var stopCmd = &cobra.Command{ Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { minerName := args[0] - manager := getServiceManager() + manager := getManager() if err := manager.StopMiner(context.Background(), minerName); err != nil { return fmt.Errorf("failed to stop miner: %w", err) diff --git a/cmd/mining/cmd/uninstall.go b/cmd/mining/cmd/uninstall.go index 4589f32..0eafd5c 100644 --- a/cmd/mining/cmd/uninstall.go +++ b/cmd/mining/cmd/uninstall.go @@ -15,7 +15,7 @@ var uninstallCmd = &cobra.Command{ Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { minerType := args[0] - manager := getServiceManager() // getServiceManager() returns the shared manager used by `mining uninstall`. + manager := getManager() // getManager() returns the shared manager used by `mining uninstall`. fmt.Printf("Uninstalling %s...\n", minerType) if err := manager.UninstallMiner(context.Background(), minerType); err != nil {