refactor: consolidate rollupsmachine and cartesimachine onto machine

Author: vfusco

cmd/cartesi-rollups-advancer/root/root.go

@@ -72,7 +72,7 @@ func init() {
 
 	Cmd.Flags().StringVar(&machinelogLevel, "machine-log-level", "info",
 		"Remote Machine log level: trace, debug, info, warning, error, fatal")
-	cobra.CheckErr(viper.BindPFlag(config.REMOTE_MACHINE_LOG_LEVEL, Cmd.Flags().Lookup("machine-log-level")))
+	cobra.CheckErr(viper.BindPFlag(config.JSONRPC_MACHINE_LOG_LEVEL, Cmd.Flags().Lookup("machine-log-level")))
 
 	// TODO: validate on preRunE
 	Cmd.PreRunE = func(cmd *cobra.Command, args []string) error {

cmd/cartesi-rollups-node/root/root.go

@@ -114,7 +114,7 @@ func init() {
 
 	Cmd.Flags().StringVar(&machinelogLevel, "machine-log-level", "info",
 		"Remote Machine log level: trace, debug, info, warning, error, fatal")
-	cobra.CheckErr(viper.BindPFlag(config.REMOTE_MACHINE_LOG_LEVEL, Cmd.Flags().Lookup("machine-log-level")))
+	cobra.CheckErr(viper.BindPFlag(config.JSONRPC_MACHINE_LOG_LEVEL, Cmd.Flags().Lookup("machine-log-level")))
 
 	Cmd.Flags().Uint64Var(&maxBlockRange, "max-block-range", 0,
 		"Maximum number of blocks in a single query. large queries will be split automatically. Zero for unlimited.")

internal/advancer/advancer.go

@@ -83,7 +83,6 @@ func Create(ctx context.Context, c *CreateInfo) (*Service, error) {
 	manager := manager.NewMachineManager(
 		ctx,
 		c.Repository,
-		c.Config.RemoteMachineLogLevel,
 		s.Logger,
 		c.Config.FeatureMachineHashCheckEnabled,
 	)

internal/config/config.go

@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"github.com/cartesi/rollups-node/internal/model"
-	"github.com/cartesi/rollups-node/pkg/rollupsmachine/cartesimachine"
 
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -31,14 +30,13 @@ func (r Redacted[T]) String() string {
 }
 
 type (
-	URL             = *url.URL
-	Duration        = time.Duration
-	LogLevel        = slog.Level
-	DefaultBlock    = model.DefaultBlock
-	RedactedString  = Redacted[string]
-	RedactedUint    = Redacted[uint32]
-	MachineLogLevel = cartesimachine.MachineLogLevel
-	Address         = common.Address
+	URL            = *url.URL
+	Duration       = time.Duration
+	LogLevel       = slog.Level
+	DefaultBlock   = model.DefaultBlock
+	RedactedString = Redacted[string]
+	RedactedUint   = Redacted[uint32]
+	Address        = common.Address
 )
 
 // ------------------------------------------------------------------------------------------------
@@ -55,6 +53,22 @@ const (
 	AuthKindAWS
 )
 
+// ------------------------------------------------------------------------------------------------
+// JSON-RPC Machine log level
+// ------------------------------------------------------------------------------------------------
+
+// MachineLogLevel represents the verbosity level for machine logs
+type MachineLogLevel string
+
+const (
+	MachineLogLevelTrace MachineLogLevel = "trace"
+	MachineLogLevelDebug MachineLogLevel = "debug"
+	MachineLogLevelInfo  MachineLogLevel = "info"
+	MachineLogLevelWarn  MachineLogLevel = "warn"
+	MachineLogLevelError MachineLogLevel = "error"
+	MachineLogLevelFatal MachineLogLevel = "fatal"
+)
+
 // ------------------------------------------------------------------------------------------------
 // Parsing functions
 // ------------------------------------------------------------------------------------------------
@@ -95,7 +109,18 @@ func ToLogLevelFromString(s string) (LogLevel, error) {
 }
 
 func ToMachineLogLevelFromString(s string) (MachineLogLevel, error) {
-	return cartesimachine.ParseMachineLogLevel(s)
+	var m = map[string]MachineLogLevel{
+		string(MachineLogLevelTrace): MachineLogLevelTrace,
+		string(MachineLogLevelDebug): MachineLogLevelDebug,
+		string(MachineLogLevelInfo):  MachineLogLevelInfo,
+		string(MachineLogLevelWarn):  MachineLogLevelWarn,
+		string(MachineLogLevelError): MachineLogLevelError,
+		string(MachineLogLevelFatal): MachineLogLevelFatal,
+	}
+	if v, ok := m[s]; ok {
+		return v, nil
+	}
+	return "", fmt.Errorf("invalid remote machine log level")
 }
 
 func ToAddressFromString(s string) (Address, error) {
@@ -210,6 +235,6 @@ var (
 	notDefinedRedactedString  = func() RedactedString { return RedactedString{""} }
 	notDefinedRedactedUint    = func() RedactedUint { return RedactedUint{0} }
 	notDefinedURL             = func() URL { return &url.URL{} }
-	notDefinedMachineLogLevel = func() MachineLogLevel { return cartesimachine.MachineLogLevelInfo }
+	notDefinedMachineLogLevel = func() MachineLogLevel { return MachineLogLevelInfo }
 	notDefinedAddress         = func() Address { return common.Address{} }
 )

internal/config/generate/Config.toml

@@ -329,9 +329,9 @@ used-by = ["advancer", "node", "cli"]
 # Remote Cartesi Machine
 #
 
-[machine.CARTESI_REMOTE_MACHINE_LOG_LEVEL]
+[machine.CARTESI_JSONRPC_MACHINE_LOG_LEVEL]
 default = "info"
-go-type = "MachineLogLevel"
+go-type = "string"
 description = """
 Remote Cartesi Machine server log level.
 One of "trace", "debug", "info", "warning", "error", "fatal"."""