diff --git a/pkg/cmd/chainlink-evm/main.go b/pkg/cmd/chainlink-evm/main.go index 866abb3649..b042c8ceec 100644 --- a/pkg/cmd/chainlink-evm/main.go +++ b/pkg/cmd/chainlink-evm/main.go @@ -10,6 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/smartcontractkit/chainlink-common/pkg/beholder" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config" clhttp "github.com/smartcontractkit/chainlink-common/pkg/http" "github.com/smartcontractkit/chainlink-common/pkg/logger" @@ -67,7 +68,7 @@ type pluginRelayer struct { sqlutil.DataSource } -func (c *pluginRelayer) NewRelayer(ctx context.Context, configTOML string, keystore, csaKeystore core.Keystore, capRegistry core.CapabilitiesRegistry) (loop.Relayer, error) { +func (c *pluginRelayer) NewRelayer(ctx context.Context, configTOML string, keystore, csaKeystore core.Keystore, capRegistry registry.CapabilitiesRegistry) (loop.Relayer, error) { var cfg struct { EVM evmcfg.EVMConfig } diff --git a/pkg/relay/evm.go b/pkg/relay/evm.go index c60fe4e9f3..957fffc22a 100644 --- a/pkg/relay/evm.go +++ b/pkg/relay/evm.go @@ -24,6 +24,7 @@ import ( chainselectors "github.com/smartcontractkit/chain-selectors" + "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/services" @@ -142,7 +143,7 @@ type Relayer struct { csaKeystore coretypes.Keystore evmKeystore keys.Store codec commontypes.Codec - capabilitiesRegistry coretypes.CapabilitiesRegistry + capabilitiesRegistry registry.CapabilitiesRegistry pluginConfigEmitter services.Service evmService @@ -170,7 +171,7 @@ type RelayerOpts struct { MercuryPool wsrpc.Pool RetirementReportCache retirement.RetirementReportCache MercuryConfig MercuryConfig - CapabilitiesRegistry coretypes.CapabilitiesRegistry + CapabilitiesRegistry registry.CapabilitiesRegistry HTTPClient *http.Client } diff --git a/pkg/relay/evm_test.go b/pkg/relay/evm_test.go index d2a5db9de3..0ec7baf42b 100644 --- a/pkg/relay/evm_test.go +++ b/pkg/relay/evm_test.go @@ -5,6 +5,7 @@ import ( "github.com/stretchr/testify/assert" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" "github.com/smartcontractkit/chainlink-common/pkg/types/core" "github.com/smartcontractkit/chainlink-evm/pkg/keys" @@ -16,7 +17,7 @@ func TestRelayerOpts_Validate(t *testing.T) { DS sqlutil.DataSource CSAKeystore core.Keystore EVMKeystore keys.ChainStore - CapabilitiesRegistry core.CapabilitiesRegistry + CapabilitiesRegistry registry.CapabilitiesRegistry } tests := []struct { name string diff --git a/pkg/relay/llo_provider.go b/pkg/relay/llo_provider.go index f7abbbef2a..c0044cdecf 100644 --- a/pkg/relay/llo_provider.go +++ b/pkg/relay/llo_provider.go @@ -14,6 +14,7 @@ import ( ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" + "github.com/smartcontractkit/chainlink-common/pkg/capabilities/registry" "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/services" "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" @@ -88,7 +89,7 @@ func NewLLOProvider( retirementReportCache retirement.RetirementReportCache, ds sqlutil.DataSource, mercuryPool wsrpc.Pool, - capabilitiesRegistry coretypes.CapabilitiesRegistry, + capabilitiesRegistry registry.CapabilitiesRegistry, ) (relaytypes.LLOProvider, error) { donID := relayConfig.LLODONID lp := chain.LogPoller()