Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions pkg/capabilities/registry/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading