From b1cfbf4326be2d661aa6e7ce169d97e58093a844 Mon Sep 17 00:00:00 2001 From: Fergal Gribben Date: Tue, 12 Dec 2023 14:55:16 +0000 Subject: [PATCH] Clean up EVMProvider --- core/services/ocr2/plugins/ocr2keeper/util.go | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go index 6c1d3685fdb..698f9e65c98 100644 --- a/core/services/ocr2/plugins/ocr2keeper/util.go +++ b/core/services/ocr2/plugins/ocr2keeper/util.go @@ -12,19 +12,16 @@ import ( ocr2keepers20polling "github.com/smartcontractkit/chainlink-automation/pkg/v2/observer/polling" ocr2keepers20runner "github.com/smartcontractkit/chainlink-automation/pkg/v2/runner" ocr2keepers21 "github.com/smartcontractkit/chainlink-automation/pkg/v3/types" - "github.com/smartcontractkit/chainlink-common/pkg/types" "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/job" - "github.com/smartcontractkit/chainlink/v2/core/services/keystore" "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey" "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models" evmregistry20 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20" evmregistry21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21" evmregistry21transmit "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit" "github.com/smartcontractkit/chainlink/v2/core/services/pg" - evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm" ) type Encoder20 interface { @@ -43,29 +40,6 @@ var ( ErrNoChainFromSpec = fmt.Errorf("could not create chain from spec") ) -func EVMProvider(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, spec job.Job, ethKeystore keystore.Eth) (evmrelay.OCR2KeeperProvider, error) { - oSpec := spec.OCR2OracleSpec - ocr2keeperRelayer := evmrelay.NewOCR2KeeperRelayer(db, chain, lggr.Named("OCR2KeeperRelayer"), ethKeystore) - - keeperProvider, err := ocr2keeperRelayer.NewOCR2KeeperProvider( - types.RelayArgs{ - ExternalJobID: spec.ExternalJobID, - JobID: oSpec.ID, - ContractID: oSpec.ContractID, - RelayConfig: oSpec.RelayConfig.Bytes(), - }, - types.PluginArgs{ - TransmitterID: oSpec.TransmitterID.String, - PluginConfig: oSpec.PluginConfig.Bytes(), - }, - ) - if err != nil { - return nil, fmt.Errorf("%w: failed to create new ocr2keeper provider", err) - } - - return keeperProvider, nil -} - func EVMDependencies20( spec job.Job, lggr logger.Logger,