WIP

Author: winder

build/devenv/environment.go

@@ -311,20 +311,25 @@ func NewEnvironment() (in *Cfg, err error) {
 		}
 	}
 
-	// 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)
+	// 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 {
-		if ver.Mode == services.Standalone {
-			_, err = services.NewVerifier(ver)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create verifier service: %w", err)
+		// Start standalone verifiers if in standalone mode.
+		for _, ver := range in.Verifier {
+			if ver.Mode == services.Standalone {
+				_, err = services.NewVerifier(ver)
+				if err != nil {
+					return nil, fmt.Errorf("failed to create verifier service: %w", err)
+				}
 			}
 		}
 	}