Skip to content
Merged
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
3 changes: 2 additions & 1 deletion pkg/cmd/chainlink-evm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Comment thread
cedric-cordenier marked this conversation as resolved.
Resolved
var cfg struct {
EVM evmcfg.EVMConfig
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/relay/evm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -170,7 +171,7 @@ type RelayerOpts struct {
MercuryPool wsrpc.Pool
RetirementReportCache retirement.RetirementReportCache
MercuryConfig MercuryConfig
CapabilitiesRegistry coretypes.CapabilitiesRegistry
CapabilitiesRegistry registry.CapabilitiesRegistry
HTTPClient *http.Client
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/relay/evm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkg/relay/llo_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down
Loading