diff --git a/pkg/capabilities/registry/base_test.go b/pkg/capabilities/registry/base_test.go index d66d434427..bdbcbdcf11 100644 --- a/pkg/capabilities/registry/base_test.go +++ b/pkg/capabilities/registry/base_test.go @@ -16,7 +16,6 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" - "github.com/smartcontractkit/chainlink-common/pkg/types/core" ) type mockCapability struct { @@ -186,13 +185,13 @@ func TestRegistry_NoDuplicateIDs(t *testing.T) { func TestRegistry_ChecksExecutionAPIByType(t *testing.T) { tcs := []struct { name string - newCapability func(ctx context.Context, reg core.CapabilitiesRegistryBase) (string, error) - getCapability func(ctx context.Context, reg core.CapabilitiesRegistryBase, id string) error + newCapability func(ctx context.Context, reg registry.CapabilitiesRegistryBase) (string, error) + getCapability func(ctx context.Context, reg registry.CapabilitiesRegistryBase, id string) error errContains string }{ { name: "action", - newCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase) (string, error) { + newCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase) (string, error) { id := fmt.Sprintf("%s@%s", uuid.New().String(), "1.0.0") ci, err := capabilities.NewCapabilityInfo( id, @@ -204,14 +203,14 @@ func TestRegistry_ChecksExecutionAPIByType(t *testing.T) { c := &mockCapability{CapabilityInfo: ci} return id, reg.Add(ctx, c) }, - getCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase, id string) error { + getCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase, id string) error { _, err := reg.GetExecutable(ctx, id) return err }, }, { name: "target", - newCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase) (string, error) { + newCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase) (string, error) { id := fmt.Sprintf("%s@%s", uuid.New().String(), "1.0.0") ci, err := capabilities.NewCapabilityInfo( id, @@ -223,27 +222,27 @@ func TestRegistry_ChecksExecutionAPIByType(t *testing.T) { c := &mockCapability{CapabilityInfo: ci} return id, reg.Add(ctx, c) }, - getCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase, id string) error { + getCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase, id string) error { _, err := reg.GetExecutable(ctx, id) return err }, }, { name: "trigger", - newCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase) (string, error) { + newCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase) (string, error) { trigger := newTestTrigger(uuid.New().String()) info, err := trigger.Info(ctx) require.NoError(t, err) return info.ID, reg.Add(ctx, trigger) }, - getCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase, id string) error { + getCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase, id string) error { _, err := reg.GetTrigger(ctx, id) return err }, }, { name: "consensus", - newCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase) (string, error) { + newCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase) (string, error) { id := fmt.Sprintf("%s@%s", uuid.New().String(), "1.0.0") ci, err := capabilities.NewCapabilityInfo( id, @@ -255,7 +254,7 @@ func TestRegistry_ChecksExecutionAPIByType(t *testing.T) { c := &mockCapability{CapabilityInfo: ci} return id, reg.Add(ctx, c) }, - getCapability: func(ctx context.Context, reg core.CapabilitiesRegistryBase, id string) error { + getCapability: func(ctx context.Context, reg registry.CapabilitiesRegistryBase, id string) error { _, err := reg.GetExecutable(ctx, id) return err }, diff --git a/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go b/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go index ef37987df6..2f5727b7ff 100644 --- a/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go +++ b/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -43,7 +44,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go b/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go index 63ecb62011..c3fe2ce174 100644 --- a/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go +++ b/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -45,7 +46,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/actions/http/server/client_server_gen.go b/pkg/capabilities/v2/actions/http/server/client_server_gen.go index 0a11a90f72..2cd07e91ae 100644 --- a/pkg/capabilities/v2/actions/http/server/client_server_gen.go +++ b/pkg/capabilities/v2/actions/http/server/client_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -43,7 +44,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go index dfdbe27aaf..0ef5b39540 100644 --- a/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go +++ b/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -54,7 +55,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go index c99ea8cf0e..0fb2b758de 100644 --- a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go +++ b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -64,7 +65,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go index 042ee06013..86258f5046 100644 --- a/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go +++ b/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -74,7 +75,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/chain-capabilities/stellar/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/stellar/server/client_server_gen.go index 8e1e6dcc97..120d91a7d0 100644 --- a/pkg/capabilities/v2/chain-capabilities/stellar/server/client_server_gen.go +++ b/pkg/capabilities/v2/chain-capabilities/stellar/server/client_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -56,7 +57,7 @@ func NewClientServer(capability ClientCapability) *ClientServer { type ClientServer struct { clientCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/consensus/server/consensus_server_gen.go b/pkg/capabilities/v2/consensus/server/consensus_server_gen.go index bc03a93960..447b39c685 100644 --- a/pkg/capabilities/v2/consensus/server/consensus_server_gen.go +++ b/pkg/capabilities/v2/consensus/server/consensus_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -46,7 +47,7 @@ func NewConsensusServer(capability ConsensusCapability) *ConsensusServer { type ConsensusServer struct { consensusCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl b/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl index db87790a51..0903fa6ad5 100644 --- a/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl +++ b/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl @@ -19,6 +19,7 @@ import ( {{- end }} "github.com/smartcontractkit/chainlink-common/pkg/types/core" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" @@ -86,7 +87,7 @@ func New{{.GoName}}Server(capability {{.GoName}}Capability) *{{.GoName}}Server { type {{.GoName}}Server struct { {{.GoName|LowerFirst}}Capability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go index 01c72a770b..d21247e742 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -47,7 +48,7 @@ func NewBasicServer(capability BasicCapability) *BasicServer { type BasicServer struct { basicCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go index 6b610006a9..a9ef333eef 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -43,7 +44,7 @@ func NewBasicActionServer(capability BasicActionCapability) *BasicActionServer { type BasicActionServer struct { basicActionCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go index 1b5502ad0e..e6767d6962 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -45,7 +46,7 @@ func NewBasicServer(capability BasicCapability) *BasicServer { type BasicServer struct { basicCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go index bc03a93960..447b39c685 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -46,7 +47,7 @@ func NewConsensusServer(capability ConsensusCapability) *ConsensusServer { type ConsensusServer struct { consensusCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go index e96806afc7..02d58f2bf5 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go @@ -13,6 +13,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -44,7 +45,7 @@ func NewBasicActionServer(capability BasicActionCapability) *BasicActionServer { type BasicActionServer struct { basicActionCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go index b81df57651..2981d135c6 100644 --- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go +++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -43,7 +44,7 @@ func NewBasicActionServer(capability BasicActionCapability) *BasicActionServer { type BasicActionServer struct { basicActionCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go b/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go index b112f0cf73..7eb3a6b62a 100644 --- a/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go +++ b/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -48,7 +49,7 @@ func NewCronServer(capability CronCapability) *CronServer { type CronServer struct { cronCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go b/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go index c960d93448..670719e2aa 100644 --- a/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go +++ b/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go @@ -12,6 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" caperrors "github.com/smartcontractkit/chainlink-common/pkg/capabilities/errors" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" capmon "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/monitoring" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "go.opentelemetry.io/otel/attribute" @@ -45,7 +46,7 @@ func NewHTTPServer(capability HTTPCapability) *HTTPServer { type HTTPServer struct { hTTPCapability - capabilityRegistry core.CapabilitiesRegistry + capabilityRegistry registry.CapabilitiesRegistry stopCh chan struct{} initMetrics capmon.InitMetrics } diff --git a/pkg/loop/internal/core/services/capability/capabilities_registry_test.go b/pkg/loop/internal/core/services/capability/capabilities_registry_test.go index def9c87ea8..153e428808 100644 --- a/pkg/loop/internal/core/services/capability/capabilities_registry_test.go +++ b/pkg/loop/internal/core/services/capability/capabilities_registry_test.go @@ -18,9 +18,9 @@ import ( "github.com/smartcontractkit/chainlink-protos/cre/go/values" "github.com/smartcontractkit/chainlink-common/pkg/capabilities" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/net" - "github.com/smartcontractkit/chainlink-common/pkg/types/core" "github.com/smartcontractkit/chainlink-common/pkg/types/core/mocks" ) @@ -149,7 +149,7 @@ func TestCapabilitiesRegistry(t *testing.T) { regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) // No capabilities in register @@ -393,7 +393,7 @@ func TestCapabilitiesRegistry_ConfigForCapabilities_IncludingV2Methods(t *testin regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "some-cap@1.0.0" @@ -448,7 +448,7 @@ func TestCapabilitiesRegistry_ConfigForCapability_RemoteExecutableConfig(t *test regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "some-cap@1.0.0" @@ -496,7 +496,7 @@ func TestCapabilitiesRegistry_ConfigForCapability_WithOcr3Configs(t *testing.T) regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "ocr-cap@1.0.0" @@ -561,7 +561,7 @@ func TestCapabilitiesRegistry_DONsForCapability(t *testing.T) { regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "some-cap@1.0.0" @@ -656,7 +656,7 @@ func TestCapabilitiesRegistry_ConfigForCapability_DefaultConfig(t *testing.T) { regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "some-cap@1.0.0" @@ -707,7 +707,7 @@ func TestCapabilitiesRegistry_ConfigForCapability_NilDefaultConfig(t *testing.T) regClient, err := client.Dispense(pluginName) require.NoError(t, err) - rc, ok := regClient.(core.CapabilitiesRegistry) + rc, ok := regClient.(registry.CapabilitiesRegistry) require.True(t, ok) capID := "some-cap@1.0.0" diff --git a/pkg/loop/internal/core/services/capability/transport.go b/pkg/loop/internal/core/services/capability/transport.go index 90e129ed8d..bd4baa47f1 100644 --- a/pkg/loop/internal/core/services/capability/transport.go +++ b/pkg/loop/internal/core/services/capability/transport.go @@ -6,9 +6,9 @@ import ( "google.golang.org/grpc" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry/remote" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/net" - "github.com/smartcontractkit/chainlink-common/pkg/types/core" ) // brokerTransport implements [remote.Transport] over a go-plugin broker: a @@ -55,10 +55,10 @@ func brokerConnID(loc remote.Locator) (uint32, error) { return net.ParseBrokerTarget(loc.Target) } -func RegisterCapabilitiesRegistryServer(s *grpc.Server, b *net.BrokerExt, i core.CapabilitiesRegistry) { +func RegisterCapabilitiesRegistryServer(s *grpc.Server, b *net.BrokerExt, i registry.CapabilitiesRegistry) { remote.RegisterCapabilitiesRegistryServer(s, b.Logger, i, NewBrokerTransport(b.WithName("CapabilitiesRegistryServer"))) } -func NewCapabilitiesRegistryClient(cc grpc.ClientConnInterface, b *net.BrokerExt) core.CapabilitiesRegistry { +func NewCapabilitiesRegistryClient(cc grpc.ClientConnInterface, b *net.BrokerExt) registry.CapabilitiesRegistry { return remote.NewCapabilitiesRegistryClient(b.Logger, cc, NewBrokerTransport(b.WithName("CapabilitiesRegistryClient"))) } diff --git a/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go b/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go index ed97cae2b6..09bfbeb763 100644 --- a/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go +++ b/pkg/loop/internal/core/services/reportingplugin/ocr3/reporting_plugin_service.go @@ -12,6 +12,7 @@ import ( relayersetpb "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb/relayerset" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/relayerset" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/capability" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/errorlog" @@ -45,7 +46,7 @@ func (o *ReportingPluginServiceClient) NewReportingPluginFactory( pipelineRunner core.PipelineRunnerService, telemetryService core.TelemetryService, errorLog core.ErrorLog, - capRegistry core.CapabilitiesRegistry, + capRegistry registry.CapabilitiesRegistry, keyValueStore core.KeyValueStore, relayerSet core.RelayerSet, ) (core.OCR3ReportingPluginFactory, error) { diff --git a/pkg/loop/internal/core/services/reportingplugin/ocr3/test/factory_generators.go b/pkg/loop/internal/core/services/reportingplugin/ocr3/test/factory_generators.go index 2cdd6a3925..670de95da4 100644 --- a/pkg/loop/internal/core/services/reportingplugin/ocr3/test/factory_generators.go +++ b/pkg/loop/internal/core/services/reportingplugin/ocr3/test/factory_generators.go @@ -6,6 +6,7 @@ import ( "google.golang.org/grpc" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" pipelinetest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/pipeline/test" telemetrytest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/telemetry/test" @@ -62,7 +63,7 @@ func (s medianServer) ConnToProvider(conn grpc.ClientConnInterface, broker net.B func (s medianServer) NewReportingPluginFactory(ctx context.Context, config core.ReportingPluginServiceConfig, provider types.MedianProvider, pipelineRunner core.PipelineRunnerService, telemetry core.TelemetryClient, - errorLog core.ErrorLog, capRegistry core.CapabilitiesRegistry, + errorLog core.ErrorLog, capRegistry registry.CapabilitiesRegistry, keyValueStore core.KeyValueStore, relayerSet core.RelayerSet) (core.OCR3ReportingPluginFactory, error) { err := s.medianProvider.Evaluate(ctx, provider) if err != nil { @@ -113,7 +114,7 @@ func (s agnosticPluginServer) ConnToProvider(conn grpc.ClientConnInterface, brok func (s agnosticPluginServer) NewReportingPluginFactory(ctx context.Context, config core.ReportingPluginServiceConfig, provider types.PluginProvider, pipelineRunner core.PipelineRunnerService, telemetry core.TelemetryClient, - errorLog core.ErrorLog, capRegistry core.CapabilitiesRegistry, + errorLog core.ErrorLog, capRegistry registry.CapabilitiesRegistry, keyValueStore core.KeyValueStore, relayerSet core.RelayerSet) (core.OCR3ReportingPluginFactory, error) { err := s.provider.Evaluate(ctx, provider) if err != nil { diff --git a/pkg/loop/internal/example-relay/main.go b/pkg/loop/internal/example-relay/main.go index 335476bef8..d1671b4f87 100644 --- a/pkg/loop/internal/example-relay/main.go +++ b/pkg/loop/internal/example-relay/main.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/go-plugin" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop" "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" @@ -58,7 +59,7 @@ func (p *pluginRelayer) HealthReport() map[string]error { return map[string]erro func (p *pluginRelayer) Name() string { return p.lggr.Name() } -func (p *pluginRelayer) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, cr core.CapabilitiesRegistry) (loop.Relayer, error) { +func (p *pluginRelayer) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, cr registry.CapabilitiesRegistry) (loop.Relayer, error) { return &relayer{lggr: logger.Named(p.lggr, "Relayer"), ds: p.ds}, nil } diff --git a/pkg/loop/internal/relayer/relayer.go b/pkg/loop/internal/relayer/relayer.go index b3c8f4c939..0fd1a6ed2f 100644 --- a/pkg/loop/internal/relayer/relayer.go +++ b/pkg/loop/internal/relayer/relayer.go @@ -14,6 +14,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" "github.com/smartcontractkit/chainlink-common/pkg/beholder" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" aptospb "github.com/smartcontractkit/chainlink-common/pkg/chains/aptos" evmpb "github.com/smartcontractkit/chainlink-common/pkg/chains/evm" solpb "github.com/smartcontractkit/chainlink-common/pkg/chains/solana" @@ -56,7 +57,7 @@ func NewPluginRelayerClient(brokerCfg net.BrokerConfig) *PluginRelayerClient { return &PluginRelayerClient{PluginClient: pc, pluginRelayer: pb.NewPluginRelayerClient(pc), ServiceClient: goplugin.NewServiceClient(pc.BrokerExt, pc)} } -func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry core.CapabilitiesRegistry) (looptypes.Relayer, error) { +func (p *PluginRelayerClient) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry registry.CapabilitiesRegistry) (looptypes.Relayer, error) { cc := p.NewClientConn("Relayer", func(ctx context.Context) (relayerID uint32, deps net.Resources, err error) { var ksRes net.Resource ksID, ksRes, err := p.ServeNew("Keystore", func(s *grpc.Server) { diff --git a/pkg/loop/internal/relayer/test/relayer.go b/pkg/loop/internal/relayer/test/relayer.go index 7e320f235d..1b6f0f03b7 100644 --- a/pkg/loop/internal/relayer/test/relayer.go +++ b/pkg/loop/internal/relayer/test/relayer.go @@ -16,6 +16,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" keystoretest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keystore/test" chaincomponentstest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/relayer/pluginprovider/contractreader/test" @@ -184,7 +185,7 @@ func (s staticPluginRelayer) HealthReport() map[string]error { return hp } -func (s staticPluginRelayer) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry core.CapabilitiesRegistry) (looptypes.Relayer, error) { +func (s staticPluginRelayer) NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry registry.CapabilitiesRegistry) (looptypes.Relayer, error) { if s.relayer.StaticChecks && config != ConfigTOML { return nil, fmt.Errorf("expected config %q but got %q", ConfigTOML, config) } diff --git a/pkg/loop/internal/types/types.go b/pkg/loop/internal/types/types.go index ba4803f219..523821dba9 100644 --- a/pkg/loop/internal/types/types.go +++ b/pkg/loop/internal/types/types.go @@ -3,6 +3,7 @@ package internal import ( "context" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/keystore" "github.com/smartcontractkit/chainlink-common/pkg/services" "github.com/smartcontractkit/chainlink-common/pkg/types" @@ -11,7 +12,7 @@ import ( type PluginRelayer interface { services.Service - NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry core.CapabilitiesRegistry) (Relayer, error) + NewRelayer(ctx context.Context, config string, keystore, csaKeystore core.Keystore, capabilityRegistry registry.CapabilitiesRegistry) (Relayer, error) } type MedianProvider interface { diff --git a/pkg/loop/relayer_service.go b/pkg/loop/relayer_service.go index 9319499665..f628ea5ca5 100644 --- a/pkg/loop/relayer_service.go +++ b/pkg/loop/relayer_service.go @@ -6,6 +6,7 @@ import ( "math/big" "os/exec" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/goplugin" "github.com/smartcontractkit/chainlink-common/pkg/services" @@ -22,7 +23,7 @@ type RelayerService struct { // NewRelayerService returns a new [*RelayerService]. // cmd must return a new exec.Cmd each time it is called. -func NewRelayerService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.Cmd, config string, keystore core.Keystore, csaKeystore core.Keystore, capabilityRegistry core.CapabilitiesRegistry) *RelayerService { +func NewRelayerService(lggr logger.Logger, grpcOpts GRPCOpts, cmd func() *exec.Cmd, config string, keystore core.Keystore, csaKeystore core.Keystore, capabilityRegistry registry.CapabilitiesRegistry) *RelayerService { newService := func(ctx context.Context, instance any) (Relayer, services.HealthReporter, error) { plug, ok := instance.(PluginRelayer) if !ok { diff --git a/pkg/loop/reportingplugins/ocr3/grpc.go b/pkg/loop/reportingplugins/ocr3/grpc.go index c56f558ad1..157316fdd1 100644 --- a/pkg/loop/reportingplugins/ocr3/grpc.go +++ b/pkg/loop/reportingplugins/ocr3/grpc.go @@ -6,6 +6,7 @@ import ( "github.com/hashicorp/go-plugin" "google.golang.org/grpc" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/loop" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/reportingplugin/ocr3" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/telemetry" @@ -41,7 +42,7 @@ type serverAdapter struct { core.PipelineRunnerService, core.TelemetryService, core.ErrorLog, - core.CapabilitiesRegistry, + registry.CapabilitiesRegistry, core.KeyValueStore, core.RelayerSet, ) (core.OCR3ReportingPluginFactory, error) @@ -65,7 +66,7 @@ func (s serverAdapter) NewReportingPluginFactory( pr core.PipelineRunnerService, ts core.TelemetryService, errorLog core.ErrorLog, - capRegistry core.CapabilitiesRegistry, + capRegistry registry.CapabilitiesRegistry, kv core.KeyValueStore, rs core.RelayerSet, ) (core.OCR3ReportingPluginFactory, error) { @@ -80,7 +81,7 @@ func (g *GRPCService[T]) GRPCServer(broker *plugin.GRPCBroker, server *grpc.Serv pr core.PipelineRunnerService, ts core.TelemetryService, el core.ErrorLog, - capRegistry core.CapabilitiesRegistry, + capRegistry registry.CapabilitiesRegistry, kv core.KeyValueStore, rs core.RelayerSet, ) (core.OCR3ReportingPluginFactory, error) { diff --git a/pkg/loop/reportingplugins/ocr3/grpc_test.go b/pkg/loop/reportingplugins/ocr3/grpc_test.go index a6e66e8ef0..398d80fec1 100644 --- a/pkg/loop/reportingplugins/ocr3/grpc_test.go +++ b/pkg/loop/reportingplugins/ocr3/grpc_test.go @@ -16,6 +16,7 @@ import ( nettest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/net/test" reportingplugintest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/reportingplugin/test" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/test" "github.com/smartcontractkit/chainlink-common/pkg/types" "github.com/smartcontractkit/chainlink-common/pkg/types/core" @@ -38,7 +39,7 @@ func PluginGenericTest(t *testing.T, p core.OCR3ReportingPluginClient) { pipelinetest.PipelineRunner, telemetrytest.Telemetry, errorlogtest.ErrorLog, - core.CapabilitiesRegistry(nil), + registry.CapabilitiesRegistry(nil), keyvaluestoretest.KeyValueStore{}, relayersettest.RelayerSet{}) require.NoError(t, err) diff --git a/pkg/loop/reportingplugins/ocr3/loopp_service.go b/pkg/loop/reportingplugins/ocr3/loopp_service.go index d9c1b27655..7a0858da9b 100644 --- a/pkg/loop/reportingplugins/ocr3/loopp_service.go +++ b/pkg/loop/reportingplugins/ocr3/loopp_service.go @@ -9,6 +9,7 @@ import ( "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop" "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/goplugin" @@ -32,7 +33,7 @@ func NewLOOPPService( pipelineRunner core.PipelineRunnerService, telemetryService core.TelemetryService, errorLog core.ErrorLog, - capRegistry core.CapabilitiesRegistry, + capRegistry registry.CapabilitiesRegistry, keyValueStore core.KeyValueStore, relayerSet core.RelayerSet, ) *LOOPPService { diff --git a/pkg/loop/reportingplugins/ocr3/loopp_service_test.go b/pkg/loop/reportingplugins/ocr3/loopp_service_test.go index b15531cc5b..bd6195988c 100644 --- a/pkg/loop/reportingplugins/ocr3/loopp_service_test.go +++ b/pkg/loop/reportingplugins/ocr3/loopp_service_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/loop" errorlogtest "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/errorlog/test" @@ -64,7 +65,7 @@ func TestLOOPPService(t *testing.T) { pipelinetest.PipelineRunner, telemetrytest.Telemetry, errorlogtest.ErrorLog, - core.CapabilitiesRegistry(nil), + registry.CapabilitiesRegistry(nil), keyvaluestoretest.KeyValueStore{}, relayersettest.RelayerSet{}) hook := looppSvc.XXXTestHook() @@ -110,7 +111,7 @@ func TestLOOPPService_recovery(t *testing.T) { pipelinetest.PipelineRunner, telemetrytest.Telemetry, errorlogtest.ErrorLog, - core.CapabilitiesRegistry(nil), + registry.CapabilitiesRegistry(nil), keyvaluestoretest.KeyValueStore{}, relayersettest.RelayerSet{}) servicetest.Run(t, looppSvc) diff --git a/pkg/types/core/capabilities_registry.go b/pkg/types/core/capabilities_registry.go index 3a23c2e365..c3599ec082 100644 --- a/pkg/types/core/capabilities_registry.go +++ b/pkg/types/core/capabilities_registry.go @@ -5,19 +5,9 @@ import ( "errors" "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/libocr/ragep2p/types" ) -// Deprecated -type CapabilitiesRegistry = registry.CapabilitiesRegistry - -// Deprecated -type CapabilitiesRegistryMetadata = registry.CapabilitiesRegistryMetadata - -// Deprecated -type CapabilitiesRegistryBase = registry.CapabilitiesRegistryBase - type UnimplementedCapabilitiesRegistry struct { UnimplementedCapabilitiesRegistryMetadata UnimplementedCapabilitiesRegistryBase diff --git a/pkg/types/core/reporting_plugin_service.go b/pkg/types/core/reporting_plugin_service.go index 43fe40ede0..395e371344 100644 --- a/pkg/types/core/reporting_plugin_service.go +++ b/pkg/types/core/reporting_plugin_service.go @@ -7,6 +7,7 @@ import ( "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/services" "github.com/smartcontractkit/chainlink-common/pkg/types" ) @@ -39,13 +40,13 @@ type ReportingPluginServer[T types.PluginProvider] interface { type OCR3ReportingPluginClient interface { services.Service - NewReportingPluginFactory(ctx context.Context, config ReportingPluginServiceConfig, grpcProvider grpc.ClientConnInterface, pipelineRunner PipelineRunnerService, telemetry TelemetryService, errorLog ErrorLog, capRegistry CapabilitiesRegistry, keyValueStore KeyValueStore, relayerSet RelayerSet) (OCR3ReportingPluginFactory, error) + NewReportingPluginFactory(ctx context.Context, config ReportingPluginServiceConfig, grpcProvider grpc.ClientConnInterface, pipelineRunner PipelineRunnerService, telemetry TelemetryService, errorLog ErrorLog, capRegistry registry.CapabilitiesRegistry, keyValueStore KeyValueStore, relayerSet RelayerSet) (OCR3ReportingPluginFactory, error) NewValidationService(ctx context.Context) (ValidationService, error) } type OCR3ReportingPluginServer[T types.PluginProvider] interface { services.Service - NewReportingPluginFactory(ctx context.Context, config ReportingPluginServiceConfig, provider T, pipelineRunner PipelineRunnerService, telemetry TelemetryClient, errorLog ErrorLog, capRegistry CapabilitiesRegistry, keyValueStore KeyValueStore, relayerSet RelayerSet) (OCR3ReportingPluginFactory, error) + NewReportingPluginFactory(ctx context.Context, config ReportingPluginServiceConfig, provider T, pipelineRunner PipelineRunnerService, telemetry TelemetryClient, errorLog ErrorLog, capRegistry registry.CapabilitiesRegistry, keyValueStore KeyValueStore, relayerSet RelayerSet) (OCR3ReportingPluginFactory, error) NewValidationService(ctx context.Context) (ValidationService, error) } diff --git a/pkg/types/core/standard_capabilities_dependencies.go b/pkg/types/core/standard_capabilities_dependencies.go index 60f310c06b..1a06d62319 100644 --- a/pkg/types/core/standard_capabilities_dependencies.go +++ b/pkg/types/core/standard_capabilities_dependencies.go @@ -2,6 +2,7 @@ package core import ( "github.com/smartcontractkit/chainlink-common/pkg/capabilities" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/services/orgresolver" "github.com/smartcontractkit/chainlink-common/pkg/settings" ) @@ -13,7 +14,7 @@ type StandardCapabilitiesDependencies struct { Config string TelemetryService TelemetryService Store KeyValueStore - CapabilityRegistry CapabilitiesRegistry + CapabilityRegistry registry.CapabilitiesRegistry ErrorLog ErrorLog PipelineRunner PipelineRunnerService RelayerSet RelayerSet