Set mode per service.

WIP

Author: winder

build/devenv/environment.go

@@ -61,15 +61,8 @@ const (
 `
 )
 
-type Mode string
-
-const (
-	Standalone Mode = "standalone"
-	CL         Mode = "cl"
-)
-
 type Cfg struct {
-	Mode               Mode                        `toml:"mode"`
+	Mode               services.Mode               `toml:"mode"`
 	CLDF               CLDF                        `toml:"cldf"                  validate:"required"`
 	JD                 *jd.Input                   `toml:"jd"                    validate:"required"`
 	Fake               *services.FakeInput         `toml:"fake"                  validate:"required"`
@@ -129,16 +122,29 @@ func NewEnvironment() (in *Cfg, err error) {
 	///////////////////////////////
 	// Start: Initialize Configs //
 	///////////////////////////////
+
+	var hasCLNodeService bool
+
 	// Override the default config to "cl"...
 	if in.Mode == "" {
-		in.Mode = Standalone
+		in.Mode = services.Standalone
 	}
 
 	// Verifier configs...
-	for _, ver := range in.Verifier {
+	for i, ver := range in.Verifier {
+		services.ApplyVerifierDefaults(ver)
 		// deterministic key generation algorithm.
 		ver.ConfigFilePath = fmt.Sprintf("/app/cmd/verifier/testconfig/%s/verifier-%d.toml", ver.CommitteeName, ver.NodeIndex+1)
 		ver.SigningKey = cciptestinterfaces.XXXNewVerifierPrivateKey(ver.CommitteeName, ver.NodeIndex)
+		in.Verifier[i] = ver // technically not needed because it's a pointer.
+
+		hasCLNodeService = hasCLNodeService || (ver.Mode == services.CL)
+	}
+
+	// Executor config...
+	if in.Executor != nil {
+		services.ApplyExecutorDefaults(in.Executor)
+		hasCLNodeService = hasCLNodeService || (in.Executor.Mode == services.CL)
 	}
 
 	/////////////////////////////
@@ -262,7 +268,7 @@ func NewEnvironment() (in *Cfg, err error) {
 	timeTrack.Record("[infra] deployed CL nodes")
 	timeTrack.Record("[changeset] deployed product contracts")
 
-	if in.Mode == CL { //nolint:nestif // large block needed for clarity, refactor as a cl node component later
+	if hasCLNodeService { //nolint:nestif // large block needed for clarity, refactor as a cl node component later
 		clChainConfigs := make([]string, 0)
 		clChainConfigs = append(clChainConfigs, CommonCLNodesConfig)
 		for i, impl := range impls {
@@ -311,23 +317,31 @@ func NewEnvironment() (in *Cfg, err error) {
 					if err != nil {
 						return nil, fmt.Errorf("decoding verifier signing key (%s): %w", ver.ContainerName, err)
 					}
-					cc.ImportEVMKey(pk, ver.CommitteeName)
+					cc.ImportEVMKey(pk, ver.ContainerName)
 				}
 			}
 		}
 	}
 
-	// Start standalone executor/verifiers if in standalone mode.
-	if in.Mode == Standalone {
-		_, err = services.NewExecutor(in.Executor)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create executor service: %w", err)
+	// TODO: remove this if condition once configuration is injected into the node.
+	// For now, if the core node is started, assume that it will launch all services.
+	// TODO: Maybe it starts with just the verifiers.
+	if !hasCLNodeService {
+		// Start standalone executor if in standalone mode.
+		if in.Executor != nil && in.Executor.Mode == services.Standalone {
+			_, err = services.NewExecutor(in.Executor)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create executor service: %w", err)
+			}
 		}
 
+		// Start standalone verifiers if in standalone mode.
 		for _, ver := range in.Verifier {
-			_, err = services.NewVerifier(ver)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create verifier service: %w", err)
+			if ver.Mode == services.Standalone {
+				_, err = services.NewVerifier(ver)
+				if err != nil {
+					return nil, fmt.Errorf("failed to create verifier service: %w", err)
+				}
 			}
 		}
 	}

build/devenv/services/common.go

@@ -9,6 +9,13 @@ import (
 	"github.com/testcontainers/testcontainers-go"
 )
 
+type Mode string
+
+const (
+	Standalone Mode = "standalone"
+	CL         Mode = "cl"
+)
+
 const (
 	AppPathInsideContainer = "/app"
 )

build/devenv/services/executor.go

@@ -16,9 +16,11 @@ const (
 	DefaultExecutorName  = "executor"
 	DefaultExecutorImage = "executor:dev"
 	DefaultExecutorPort  = 8101
+	DefaultExecutorMode  = Standalone
 )
 
 type ExecutorInput struct {
+	Mode           Mode            `toml:"mode"`
 	Out            *ExecutorOutput `toml:"-"`
 	Image          string          `toml:"image"`
 	SourceCodePath string          `toml:"source_code_path"`
@@ -35,7 +37,7 @@ type ExecutorOutput struct {
 	UseCache        bool   `toml:"use_cache"`
 }
 
-func executorDefaults(in *ExecutorInput) {
+func ApplyExecutorDefaults(in *ExecutorInput) {
 	if in.Image == "" {
 		in.Image = DefaultExecutorImage
 	}
@@ -45,6 +47,9 @@ func executorDefaults(in *ExecutorInput) {
 	if in.ContainerName == "" {
 		in.ContainerName = DefaultExecutorName
 	}
+	if in.Mode == "" {
+		in.Mode = DefaultExecutorMode
+	}
 }
 
 func NewExecutor(in *ExecutorInput) (*ExecutorOutput, error) {
@@ -55,7 +60,7 @@ func NewExecutor(in *ExecutorInput) (*ExecutorOutput, error) {
 		return in.Out, nil
 	}
 	ctx := context.Background()
-	executorDefaults(in)
+	ApplyExecutorDefaults(in)
 	p, err := CwdSourcePath(in.SourceCodePath)
 	if err != nil {
 		return in.Out, err

build/devenv/services/verifier.go

@@ -26,6 +26,7 @@ const (
 	DefaultVerifierPort    = 8100
 	DefaultVerifierDBPort  = 8432
 	DefaultVerifierSQLInit = "init.sql"
+	DefaultVerifierMode    = Standalone
 
 	DefaultVerifierDBImage = "postgres:16-alpine"
 )
@@ -75,11 +76,13 @@ type VerifierEnvConfig struct {
 }
 
 type VerifierInput struct {
-	DB                *VerifierDBInput     `toml:"db"`
-	Out               *VerifierOutput      `toml:"out"`
-	Image             string               `toml:"image"`
-	SourceCodePath    string               `toml:"source_code_path"`
-	RootPath          string               `toml:"root_path"`
+	Mode           Mode             `toml:"mode"`
+	DB             *VerifierDBInput `toml:"db"`
+	Out            *VerifierOutput  `toml:"out"`
+	Image          string           `toml:"image"`
+	SourceCodePath string           `toml:"source_code_path"`
+	RootPath       string           `toml:"root_path"`
+	// TODO: Rename to VerifierID -- maps to this value in verifier.Config
 	ContainerName     string               `toml:"container_name"`
 	VerifierConfig    verifier.Config      `toml:"verifier_config"`
 	Port              int                  `toml:"port"`
@@ -102,7 +105,7 @@ type VerifierOutput struct {
 	UseCache           bool   `toml:"use_cache"`
 }
 
-func verifierDefaults(in *VerifierInput) {
+func ApplyVerifierDefaults(in *VerifierInput) {
 	if in.Image == "" {
 		in.Image = DefaultVerifierImage
 	}
@@ -122,6 +125,9 @@ func verifierDefaults(in *VerifierInput) {
 	if in.ConfigFilePath == "" {
 		in.ConfigFilePath = fmt.Sprintf("/app/cmd/verifier/testconfig/%s/verifier-%d.toml", in.CommitteeName, in.NodeIndex+1)
 	}
+	if in.Mode == "" {
+		in.Mode = DefaultVerifierMode
+	}
 }
 
 func NewVerifier(in *VerifierInput) (*VerifierOutput, error) {
@@ -133,7 +139,7 @@ func NewVerifier(in *VerifierInput) (*VerifierOutput, error) {
 	}
 	ctx := context.Background()
 
-	verifierDefaults(in)
+	ApplyVerifierDefaults(in)
 	p, err := CwdSourcePath(in.SourceCodePath)
 	if err != nil {
 		return in.Out, err