feat: separate service command into rollapp specific services

dymensionxyz · Aug 12, 2024 · 3a8c36f · 3a8c36f
1 parent 817dc50
commit 3a8c36f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/cmd/rollapp/rollapp.go b/cmd/rollapp/rollapp.go
@@ -8,6 +8,7 @@ import (
 	"github.com/dymensionxyz/roller/cmd/rollapp/run"
 	"github.com/dymensionxyz/roller/cmd/rollapp/start"
 	"github.com/dymensionxyz/roller/cmd/rollapp/status"
+	loadservices "github.com/dymensionxyz/roller/cmd/services/load"
 )
 
 func Cmd() *cobra.Command {
@@ -21,6 +22,7 @@ func Cmd() *cobra.Command {
 	cmd.AddCommand(start.Cmd())
 	cmd.AddCommand(config.Cmd())
 	cmd.AddCommand(run.Cmd())
+	cmd.AddCommand(loadservices.RollappCmd())
 
 	return cmd
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -13,7 +13,6 @@ import (
 	"github.com/dymensionxyz/roller/cmd/relayer"
 	"github.com/dymensionxyz/roller/cmd/rollapp"
 	"github.com/dymensionxyz/roller/cmd/run"
-	"github.com/dymensionxyz/roller/cmd/services"
 	"github.com/dymensionxyz/roller/cmd/tx"
 	"github.com/dymensionxyz/roller/cmd/utils"
 	"github.com/dymensionxyz/roller/cmd/version"
@@ -41,7 +40,7 @@ func init() {
 	rootCmd.AddCommand(relayer.Cmd())
 	rootCmd.AddCommand(keys.Cmd())
 	rootCmd.AddCommand(run.Cmd())
-	rootCmd.AddCommand(services.Cmd())
+	// rootCmd.AddCommand(services.Cmd())
 	rootCmd.AddCommand(migrate.Cmd())
 	rootCmd.AddCommand(tx.Cmd())
 	rootCmd.AddCommand(test())

diff --git a/cmd/services/load/load.go b/cmd/services/load/load.go
@@ -2,14 +2,14 @@ package load
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"text/template"
 
+	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
 
 	"github.com/dymensionxyz/roller/cmd/consts"
@@ -28,17 +28,21 @@ type ServiceTemplateData struct {
 	UserName string
 }
 
-func Cmd() *cobra.Command {
+func RollappCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "load",
 		Short: "Loads the different rollapp services on the local machine",
 		Run: func(cmd *cobra.Command, args []string) {
 			if runtime.GOOS != "linux" {
-				errorhandling.PrettifyErrorIfExists(
-					errors.New("the services commands are only available on linux machines"),
+				pterm.Error.Printf(
+					"the %s commands are only available on linux machines",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("'services'"),
 				)
+
+				return
 			}
-			for _, service := range []string{"rollapp", "da-light-client", "relayer"} {
+			for _, service := range []string{"rollapp", "da"} {
 				serviceData := ServiceTemplateData{
 					Name:     service,
 					ExecPath: consts.Executables.Roller,
@@ -53,8 +57,8 @@ func Cmd() *cobra.Command {
 				exec.Command("sudo", "systemctl", "daemon-reload"),
 			)
 			errorhandling.PrettifyErrorIfExists(err)
-			fmt.Println(
-				"💈 Services 'sequencer', 'da-light-client' and 'relayer' been loaded successfully.",
+			pterm.Success.Println(
+				"💈 Services 'sequencer', 'da-light-client' been loaded successfully.",
 				// " To start them, use 'systemctl start <service>'.",
 			)
 		},

diff --git a/cmd/services/services.go b/cmd/services/services.go
@@ -1,16 +1,10 @@
 package services
 
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/dymensionxyz/roller/cmd/services/load"
-)
-
-func Cmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "services",
-		Short: "Commands for managing the rollapp services.",
-	}
-	cmd.AddCommand(load.Cmd())
-	return cmd
-}
+// func Cmd() *cobra.Command {
+// 	cmd := &cobra.Command{
+// 		Use:   "services",
+// 		Short: "Commands for managing the rollapp services.",
+// 	}
+// 	// cmd.AddCommand(load.Cmd())
+// 	return cmd
+// }