update standard cap initialise to take a struct

Author: patrickhuie19

pkg/capabilities/v2/actions/http/client.pb.go

@@ -53,7 +53,7 @@ type {{.GoName}}Capability interface {
     Name() string
     Description() string
     Ready() error
-    Initialise(ctx context.Context, config string, telemetryService core.TelemetryService, store core.KeyValueStore, errorLog core.ErrorLog, pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory, gatewayConnector core.GatewayConnector, p2pKeyValueStore core.Keystore) error
+    Initialise(ctx context.Context, services core.StandardCapabilitiesServices) error
 }
 
 func New{{.GoName}}Server(capability {{.GoName}}Capability) *{{.GoName}}Server {
@@ -71,14 +71,14 @@ type {{.GoName}}Server struct {
 }
 
 
-func (c *{{.GoName}}Server) Initialise(ctx context.Context, config string, telemetryService core.TelemetryService, store core.KeyValueStore, capabilityRegistry core.CapabilitiesRegistry, errorLog core.ErrorLog, pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory, gatewayConnector core.GatewayConnector, p2pKeystore core.Keystore) error {
-    if err := c.{{.GoName}}Capability.Initialise(ctx, config, telemetryService, store, errorLog, pipelineRunner, relayerSet, oracleFactory, gatewayConnector, p2pKeystore); err != nil {
+func (c *{{.GoName}}Server) Initialise(ctx context.Context, services core.StandardCapabilitiesServices) error {
+    if err := c.{{.GoName}}Capability.Initialise(ctx, services); err != nil {
         return fmt.Errorf("error when initializing capability: %w", err)
     }
 
-    c.capabilityRegistry = capabilityRegistry
+    c.capabilityRegistry = services.CapabilityRegistry
 
-	if err := capabilityRegistry.Add(ctx, &{{.GoName|LowerFirst}}Capability{
+	if err := services.CapabilityRegistry.Add(ctx, &{{.GoName|LowerFirst}}Capability{
 	    {{.GoName}}Capability: c.{{.GoName}}Capability,
 	}); err != nil {
 		return fmt.Errorf("error when adding kv store action to the registry: %w", err)

pkg/capabilities/v2/actions/http/server/client_server_gen.go

@@ -31,10 +31,7 @@ import (
 
 type StandardCapabilities interface {
 	services.Service
-	Initialise(ctx context.Context, config string, telemetryService core.TelemetryService, store core.KeyValueStore,
-		capabilityRegistry core.CapabilitiesRegistry, errorLog core.ErrorLog,
-		pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory,
-		gatewayConnector core.GatewayConnector, p2pKeystore core.Keystore) error
+	Initialise(ctx context.Context, services core.StandardCapabilitiesServices) error
 	Infos(ctx context.Context) ([]capabilities.CapabilityInfo, error)
 }
 
@@ -60,10 +57,18 @@ func NewStandardCapabilitiesClient(brokerCfg net.BrokerConfig) *StandardCapabili
 	}
 }
 
-func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, config string, telemetryService core.TelemetryService,
-	keyValueStore core.KeyValueStore, capabilitiesRegistry core.CapabilitiesRegistry, errorLog core.ErrorLog,
-	pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory,
-	gatewayConnector core.GatewayConnector, p2pKeystore core.Keystore) error {
+func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, services core.StandardCapabilitiesServices) error {
+	// Extract services from struct
+	config := services.Config
+	telemetryService := services.TelemetryService
+	keyValueStore := services.Store
+	capabilitiesRegistry := services.CapabilityRegistry
+	errorLog := services.ErrorLog
+	pipelineRunner := services.PipelineRunner
+	relayerSet := services.RelayerSet
+	oracleFactory := services.OracleFactory
+	gatewayConnector := services.GatewayConnector
+	p2pKeystore := services.P2PKeystore
 	telemetryID, telemetryRes, err := c.ServeNew("Telemetry", func(s *grpc.Server) {
 		pb.RegisterTelemetryServer(s, telemetry.NewTelemetryServer(telemetryService))
 	})
@@ -306,7 +311,21 @@ func (s *standardCapabilitiesServer) Initialise(ctx context.Context, request *ca
 	resources = append(resources, net.Resource{Closer: gatewayConnectorConn, Name: "GatewayConnector"})
 	gatewayConnector := gateway.NewGatewayConnectorClient(gatewayConnectorConn, s.BrokerExt)
 
-	if err = s.impl.Initialise(ctx, request.Config, telemetry, keyValueStore, capabilitiesRegistry, errorLog, pipelineRunner, relayerSet, oracleFactory, gatewayConnector, keyStore); err != nil {
+	// Construct the StandardCapabilitiesServices struct
+	services := core.StandardCapabilitiesServices{
+		Config:             request.Config,
+		TelemetryService:   telemetry,
+		Store:              keyValueStore,
+		CapabilityRegistry: capabilitiesRegistry,
+		ErrorLog:           errorLog,
+		PipelineRunner:     pipelineRunner,
+		RelayerSet:         relayerSet,
+		OracleFactory:      oracleFactory,
+		GatewayConnector:   gatewayConnector,
+		P2PKeystore:        keyStore,
+	}
+
+	if err = s.impl.Initialise(ctx, services); err != nil {
 		s.CloseAll(resources...)
 		return nil, fmt.Errorf("failed to initialise standard capability: %w", err)
 	}