BCF-2672 cleanup legacy job orm env var loading (#11119)

* Remove unused DRSpecConfig param in LoadEnvConfigVarsVRF

* Remove unused DirectRequestSpec MinIncomingConfirmationsEnv field

* Remove unnecessary DRSpecConfig wrapper interface from job orm

* Remove DirectRequestSpec MinIncomingConfirmations override from job orm

MinIncomingConfirmations for DirectRequestSpec already gets overridden in delegate before its only usage

* Remove DirectRequestSpec MinIncomingConfirmationsENV from graphql spec

* Revert removal of DirectRequestSpec MinIncomingConfirmationsENV

* Remove legacy chains from job orm

 - Remove LoadEnvConfigVarsOCR for ocr spec, because it gets called in delegate anyway
 - Remove legacy chains as it is no longer used in orm

* Remove unused legacyChains from job_orm_test.go

* Revert "Remove unused legacyChains from job_orm_test.go"

This reverts commit dce7e3f.

* Revert "Remove legacy chains from job orm"

This reverts commit a41a48f.

* Rename legacy env var loading funcs in job orm and cleanup unused stuff

* Remove unused legacy tramsnimtter address env

* minor func rename

* Update func signature in calls to LoadDefaultVRFPollPeriod

* Remove EncryptedOCRKeyBundleIDEnv and ConfirmationsEnv

core/services/directrequest/delegate.go

@@ -77,7 +77,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 	if err != nil {
 		return nil, err
 	}
-	concreteSpec := job.LoadEnvConfigVarsDR(chain.Config().EVM(), *jb.DirectRequestSpec)
+	concreteSpec := job.SetDRMinIncomingConfirmations(chain.Config().EVM().MinIncomingConfirmations(), *jb.DirectRequestSpec)
 
 	oracle, err := operator_wrapper.NewOperator(concreteSpec.ContractAddress.Address(), chain.Client())
 	if err != nil {

core/services/job/models.go

@@ -15,6 +15,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-relay/pkg/types"
+
 	"github.com/smartcontractkit/chainlink/v2/core/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
@@ -233,35 +234,25 @@ func (pr *PipelineRun) SetID(value string) error {
 
 // OCROracleSpec defines the job spec for OCR jobs.
 type OCROracleSpec struct {
-	ID                                        int32               `toml:"-"`
-	ContractAddress                           ethkey.EIP55Address `toml:"contractAddress"`
-	P2PBootstrapPeers                         pq.StringArray      `toml:"p2pBootstrapPeers" db:"p2p_bootstrap_peers"`
-	P2PV2Bootstrappers                        pq.StringArray      `toml:"p2pv2Bootstrappers" db:"p2pv2_bootstrappers"`
-	IsBootstrapPeer                           bool                `toml:"isBootstrapPeer"`
-	EncryptedOCRKeyBundleID                   *models.Sha256Hash  `toml:"keyBundleID"`
-	EncryptedOCRKeyBundleIDEnv                bool
-	TransmitterAddress                        *ethkey.EIP55Address `toml:"transmitterAddress"`
-	TransmitterAddressEnv                     bool
-	ObservationTimeout                        models.Interval `toml:"observationTimeout"`
-	ObservationTimeoutEnv                     bool
-	BlockchainTimeout                         models.Interval `toml:"blockchainTimeout"`
-	BlockchainTimeoutEnv                      bool
-	ContractConfigTrackerSubscribeInterval    models.Interval `toml:"contractConfigTrackerSubscribeInterval"`
-	ContractConfigTrackerSubscribeIntervalEnv bool
-	ContractConfigTrackerPollInterval         models.Interval `toml:"contractConfigTrackerPollInterval"`
-	ContractConfigTrackerPollIntervalEnv      bool
-	ContractConfigConfirmations               uint16 `toml:"contractConfigConfirmations"`
-	ContractConfigConfirmationsEnv            bool
-	EVMChainID                                *utils.Big       `toml:"evmChainID" db:"evm_chain_id"`
-	DatabaseTimeout                           *models.Interval `toml:"databaseTimeout"`
-	DatabaseTimeoutEnv                        bool
-	ObservationGracePeriod                    *models.Interval `toml:"observationGracePeriod"`
-	ObservationGracePeriodEnv                 bool
-	ContractTransmitterTransmitTimeout        *models.Interval `toml:"contractTransmitterTransmitTimeout"`
-	ContractTransmitterTransmitTimeoutEnv     bool
-	CaptureEATelemetry                        bool      `toml:"captureEATelemetry"`
-	CreatedAt                                 time.Time `toml:"-"`
-	UpdatedAt                                 time.Time `toml:"-"`
+	ID                                     int32                `toml:"-"`
+	ContractAddress                        ethkey.EIP55Address  `toml:"contractAddress"`
+	P2PBootstrapPeers                      pq.StringArray       `toml:"p2pBootstrapPeers" db:"p2p_bootstrap_peers"`
+	P2PV2Bootstrappers                     pq.StringArray       `toml:"p2pv2Bootstrappers" db:"p2pv2_bootstrappers"`
+	IsBootstrapPeer                        bool                 `toml:"isBootstrapPeer"`
+	EncryptedOCRKeyBundleID                *models.Sha256Hash   `toml:"keyBundleID"`
+	TransmitterAddress                     *ethkey.EIP55Address `toml:"transmitterAddress"`
+	ObservationTimeout                     models.Interval      `toml:"observationTimeout"`
+	BlockchainTimeout                      models.Interval      `toml:"blockchainTimeout"`
+	ContractConfigTrackerSubscribeInterval models.Interval      `toml:"contractConfigTrackerSubscribeInterval"`
+	ContractConfigTrackerPollInterval      models.Interval      `toml:"contractConfigTrackerPollInterval"`
+	ContractConfigConfirmations            uint16               `toml:"contractConfigConfirmations"`
+	EVMChainID                             *utils.Big           `toml:"evmChainID" db:"evm_chain_id"`
+	DatabaseTimeout                        *models.Interval     `toml:"databaseTimeout"`
+	ObservationGracePeriod                 *models.Interval     `toml:"observationGracePeriod"`
+	ContractTransmitterTransmitTimeout     *models.Interval     `toml:"contractTransmitterTransmitTimeout"`
+	CaptureEATelemetry                     bool                 `toml:"captureEATelemetry"`
+	CreatedAt                              time.Time            `toml:"-"`
+	UpdatedAt                              time.Time            `toml:"-"`
 }
 
 // GetID is a getter function that returns the ID of the spec.
@@ -438,15 +429,14 @@ func (w *WebhookSpec) SetID(value string) error {
 }
 
 type DirectRequestSpec struct {
-	ID                          int32                    `toml:"-"`
-	ContractAddress             ethkey.EIP55Address      `toml:"contractAddress"`
-	MinIncomingConfirmations    clnull.Uint32            `toml:"minIncomingConfirmations"`
-	MinIncomingConfirmationsEnv bool                     `toml:"minIncomingConfirmationsEnv"`
-	Requesters                  models.AddressCollection `toml:"requesters"`
-	MinContractPayment          *assets.Link             `toml:"minContractPaymentLinkJuels"`
-	EVMChainID                  *utils.Big               `toml:"evmChainID"`
-	CreatedAt                   time.Time                `toml:"-"`
-	UpdatedAt                   time.Time                `toml:"-"`
+	ID                       int32                    `toml:"-"`
+	ContractAddress          ethkey.EIP55Address      `toml:"contractAddress"`
+	MinIncomingConfirmations clnull.Uint32            `toml:"minIncomingConfirmations"`
+	Requesters               models.AddressCollection `toml:"requesters"`
+	MinContractPayment       *assets.Link             `toml:"minContractPaymentLinkJuels"`
+	EVMChainID               *utils.Big               `toml:"evmChainID"`
+	CreatedAt                time.Time                `toml:"-"`
+	UpdatedAt                time.Time                `toml:"-"`
 }
 
 type CronSpec struct {
@@ -522,13 +512,11 @@ type VRFSpec struct {
 	CoordinatorAddress       ethkey.EIP55Address   `toml:"coordinatorAddress"`
 	PublicKey                secp256k1.PublicKey   `toml:"publicKey"`
 	MinIncomingConfirmations uint32                `toml:"minIncomingConfirmations"`
-	ConfirmationsEnv         bool                  `toml:"-"`
 	EVMChainID               *utils.Big            `toml:"evmChainID"`
 	FromAddresses            []ethkey.EIP55Address `toml:"fromAddresses"`
-	PollPeriod               time.Duration         `toml:"pollPeriod"` // For v2 jobs
-	PollPeriodEnv            bool
-	RequestedConfsDelay      int64         `toml:"requestedConfsDelay"` // For v2 jobs. Optional, defaults to 0 if not provided.
-	RequestTimeout           time.Duration `toml:"requestTimeout"`      // Optional, defaults to 24hr if not provided.
+	PollPeriod               time.Duration         `toml:"pollPeriod"`          // For v2 jobs
+	RequestedConfsDelay      int64                 `toml:"requestedConfsDelay"` // For v2 jobs. Optional, defaults to 0 if not provided.
+	RequestTimeout           time.Duration         `toml:"requestTimeout"`      // Optional, defaults to 24hr if not provided.
 
 	// GasLanePrice specifies the gas lane price for this VRF job.
 	// If the specified keys in FromAddresses do not have the provided gas price the job

core/services/job/orm.go

@@ -705,61 +705,41 @@ func (o *orm) FindJobs(offset, limit int) (jobs []Job, count int, err error) {
 			return err
 		}
 		for i := range jobs {
-			err = multierr.Combine(err, o.LoadEnvConfigVars(&jobs[i]))
+			err = multierr.Combine(err, o.LoadConfigVars(&jobs[i]))
 		}
 		return nil
 	})
 	return jobs, int(count), err
 }
 
-func (o *orm) LoadEnvConfigVars(jb *Job) error {
+func (o *orm) LoadConfigVars(jb *Job) error {
 	if jb.OCROracleSpec != nil {
 		ch, err := o.legacyChains.Get(jb.OCROracleSpec.EVMChainID.String())
 		if err != nil {
 			return err
 		}
-		newSpec, err := LoadEnvConfigVarsOCR(ch.Config().EVM().OCR(), ch.Config().OCR(), *jb.OCROracleSpec)
+		newSpec, err := LoadConfigVarsOCR(ch.Config().EVM().OCR(), ch.Config().OCR(), *jb.OCROracleSpec)
 		if err != nil {
 			return err
 		}
 		jb.OCROracleSpec = newSpec
-	} else if jb.VRFSpec != nil {
-		ch, err := o.legacyChains.Get(jb.VRFSpec.EVMChainID.String())
-		if err != nil {
-			return err
-		}
-		jb.VRFSpec = LoadEnvConfigVarsVRF(ch.Config().EVM(), *jb.VRFSpec)
-	} else if jb.DirectRequestSpec != nil {
-		ch, err := o.legacyChains.Get(jb.DirectRequestSpec.EVMChainID.String())
-		if err != nil {
-			return err
-		}
-		jb.DirectRequestSpec = LoadEnvConfigVarsDR(ch.Config().EVM(), *jb.DirectRequestSpec)
 	}
 	return nil
 }
 
-type DRSpecConfig interface {
-	MinIncomingConfirmations() uint32
-}
-
-func LoadEnvConfigVarsVRF(cfg DRSpecConfig, vrfs VRFSpec) *VRFSpec {
+func LoadDefaultVRFPollPeriod(vrfs VRFSpec) *VRFSpec {
 	if vrfs.PollPeriod == 0 {
-		vrfs.PollPeriodEnv = true
 		vrfs.PollPeriod = 5 * time.Second
 	}
 
 	return &vrfs
 }
 
-func LoadEnvConfigVarsDR(cfg DRSpecConfig, drs DirectRequestSpec) *DirectRequestSpec {
-	// Take the largest of the global vs specific.
-	minIncomingConfirmations := cfg.MinIncomingConfirmations()
-	if !drs.MinIncomingConfirmations.Valid || drs.MinIncomingConfirmations.Uint32 < minIncomingConfirmations {
-		drs.MinIncomingConfirmationsEnv = true
-		drs.MinIncomingConfirmations = null.Uint32From(minIncomingConfirmations)
+// SetDRMinIncomingConfirmations takes the largest of the global vs specific.
+func SetDRMinIncomingConfirmations(defaultMinIncomingConfirmations uint32, drs DirectRequestSpec) *DirectRequestSpec {
+	if !drs.MinIncomingConfirmations.Valid || drs.MinIncomingConfirmations.Uint32 < defaultMinIncomingConfirmations {
+		drs.MinIncomingConfirmations = null.Uint32From(defaultMinIncomingConfirmations)
 	}
-
 	return &drs
 }
 
@@ -773,54 +753,45 @@ type OCRConfig interface {
 	TransmitterAddress() (ethkey.EIP55Address, error)
 }
 
-// LoadEnvConfigVarsLocalOCR loads local OCR env vars into the OCROracleSpec.
-func LoadEnvConfigVarsLocalOCR(evmOcrCfg evmconfig.OCR, os OCROracleSpec, ocrCfg OCRConfig) *OCROracleSpec {
+// LoadConfigVarsLocalOCR loads local OCR vars into the OCROracleSpec.
+func LoadConfigVarsLocalOCR(evmOcrCfg evmconfig.OCR, os OCROracleSpec, ocrCfg OCRConfig) *OCROracleSpec {
 	if os.ObservationTimeout == 0 {
-		os.ObservationTimeoutEnv = true
 		os.ObservationTimeout = models.Interval(ocrCfg.ObservationTimeout())
 	}
 	if os.BlockchainTimeout == 0 {
-		os.BlockchainTimeoutEnv = true
 		os.BlockchainTimeout = models.Interval(ocrCfg.BlockchainTimeout())
 	}
 	if os.ContractConfigTrackerSubscribeInterval == 0 {
-		os.ContractConfigTrackerSubscribeIntervalEnv = true
 		os.ContractConfigTrackerSubscribeInterval = models.Interval(ocrCfg.ContractSubscribeInterval())
 	}
 	if os.ContractConfigTrackerPollInterval == 0 {
-		os.ContractConfigTrackerPollIntervalEnv = true
 		os.ContractConfigTrackerPollInterval = models.Interval(ocrCfg.ContractPollInterval())
 	}
 	if os.ContractConfigConfirmations == 0 {
-		os.ContractConfigConfirmationsEnv = true
 		os.ContractConfigConfirmations = evmOcrCfg.ContractConfirmations()
 	}
 	if os.DatabaseTimeout == nil {
-		os.DatabaseTimeoutEnv = true
 		os.DatabaseTimeout = models.NewInterval(evmOcrCfg.DatabaseTimeout())
 	}
 	if os.ObservationGracePeriod == nil {
-		os.ObservationGracePeriodEnv = true
 		os.ObservationGracePeriod = models.NewInterval(evmOcrCfg.ObservationGracePeriod())
 	}
 	if os.ContractTransmitterTransmitTimeout == nil {
-		os.ContractTransmitterTransmitTimeoutEnv = true
 		os.ContractTransmitterTransmitTimeout = models.NewInterval(evmOcrCfg.ContractTransmitterTransmitTimeout())
 	}
 	os.CaptureEATelemetry = ocrCfg.CaptureEATelemetry()
 
 	return &os
 }
 
-// LoadEnvConfigVarsOCR loads OCR env vars into the OCROracleSpec.
-func LoadEnvConfigVarsOCR(evmOcrCfg evmconfig.OCR, ocrCfg OCRConfig, os OCROracleSpec) (*OCROracleSpec, error) {
+// LoadConfigVarsOCR loads OCR config vars into the OCROracleSpec.
+func LoadConfigVarsOCR(evmOcrCfg evmconfig.OCR, ocrCfg OCRConfig, os OCROracleSpec) (*OCROracleSpec, error) {
 	if os.TransmitterAddress == nil {
 		ta, err := ocrCfg.TransmitterAddress()
 		if !errors.Is(errors.Cause(err), config.ErrEnvUnset) {
 			if err != nil {
 				return nil, err
 			}
-			os.TransmitterAddressEnv = true
 			os.TransmitterAddress = &ta
 		}
 	}
@@ -834,11 +805,10 @@ func LoadEnvConfigVarsOCR(evmOcrCfg evmconfig.OCR, ocrCfg OCRConfig, os OCROracl
 		if err != nil {
 			return nil, err
 		}
-		os.EncryptedOCRKeyBundleIDEnv = true
 		os.EncryptedOCRKeyBundleID = &encryptedOCRKeyBundleID
 	}
 
-	return LoadEnvConfigVarsLocalOCR(evmOcrCfg, os, ocrCfg), nil
+	return LoadConfigVarsLocalOCR(evmOcrCfg, os, ocrCfg), nil
 }
 
 func (o *orm) FindJobTx(id int32) (Job, error) {
@@ -872,7 +842,7 @@ func (o *orm) FindJobWithoutSpecErrors(id int32) (jb Job, err error) {
 		return jb, errors.Wrap(err, "FindJobWithoutSpecErrors failed")
 	}
 
-	return jb, o.LoadEnvConfigVars(&jb)
+	return jb, o.LoadConfigVars(&jb)
 }
 
 // FindSpecErrorsByJobIDs returns all jobs spec errors by jobs IDs
@@ -961,7 +931,7 @@ func (o *orm) findJob(jb *Job, col string, arg interface{}, qopts ...pg.QOpt) er
 	if err != nil {
 		return errors.Wrap(err, "findJob failed")
 	}
-	return o.LoadEnvConfigVars(jb)
+	return o.LoadConfigVars(jb)
 }
 
 func (o *orm) FindJobIDsWithBridge(name string) (jids []int32, err error) {
@@ -1205,7 +1175,7 @@ func (o *orm) FindJobsByPipelineSpecIDs(ids []int32) ([]Job, error) {
 			return err
 		}
 		for i := range jbs {
-			err = o.LoadEnvConfigVars(&jbs[i])
+			err = o.LoadConfigVars(&jbs[i])
 			//We must return the jobs even if the chainID is disabled
 			if err != nil && !errors.Is(err, chains.ErrNoSuchChainID) {
 				return err

core/services/job/orm_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
+	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 func NewTestORM(t *testing.T, db *sqlx.DB, legacyChains evm.LegacyChainContainer, pipelineORM pipeline.ORM, bridgeORM bridges.ORM, keyStore keystore.Master, cfg pg.QConfig) job.ORM {
@@ -27,26 +28,28 @@ func NewTestORM(t *testing.T, db *sqlx.DB, legacyChains evm.LegacyChainContainer
 	return o
 }
 
-func TestLoadEnvConfigVarsLocalOCR(t *testing.T) {
+func TestLoadConfigVarsLocalOCR(t *testing.T) {
 	t.Parallel()
 
 	config := configtest.NewTestGeneralConfig(t)
 	chainConfig := evmtest.NewChainScopedConfig(t, config)
 	jobSpec := &job.OCROracleSpec{}
 
-	jobSpec = job.LoadEnvConfigVarsLocalOCR(chainConfig.EVM().OCR(), *jobSpec, chainConfig.OCR())
+	jobSpec = job.LoadConfigVarsLocalOCR(chainConfig.EVM().OCR(), *jobSpec, chainConfig.OCR())
 
-	require.True(t, jobSpec.ObservationTimeoutEnv)
-	require.True(t, jobSpec.BlockchainTimeoutEnv)
-	require.True(t, jobSpec.ContractConfigTrackerSubscribeIntervalEnv)
-	require.True(t, jobSpec.ContractConfigTrackerPollIntervalEnv)
-	require.True(t, jobSpec.ContractConfigConfirmationsEnv)
-	require.True(t, jobSpec.DatabaseTimeoutEnv)
-	require.True(t, jobSpec.ObservationGracePeriodEnv)
-	require.True(t, jobSpec.ContractTransmitterTransmitTimeoutEnv)
+	require.Equal(t, models.Interval(chainConfig.OCR().ObservationTimeout()), jobSpec.ObservationTimeout)
+	require.Equal(t, models.Interval(chainConfig.OCR().BlockchainTimeout()), jobSpec.BlockchainTimeout)
+	require.Equal(t, models.Interval(chainConfig.OCR().ContractSubscribeInterval()), jobSpec.ContractConfigTrackerSubscribeInterval)
+	require.Equal(t, models.Interval(chainConfig.OCR().ContractPollInterval()), jobSpec.ContractConfigTrackerPollInterval)
+	require.Equal(t, chainConfig.OCR().CaptureEATelemetry(), jobSpec.CaptureEATelemetry)
+
+	require.Equal(t, chainConfig.EVM().OCR().ContractConfirmations(), jobSpec.ContractConfigConfirmations)
+	require.Equal(t, models.Interval(chainConfig.EVM().OCR().DatabaseTimeout()), *jobSpec.DatabaseTimeout)
+	require.Equal(t, models.Interval(chainConfig.EVM().OCR().ObservationGracePeriod()), *jobSpec.ObservationGracePeriod)
+	require.Equal(t, models.Interval(chainConfig.EVM().OCR().ContractTransmitterTransmitTimeout()), *jobSpec.ContractTransmitterTransmitTimeout)
 }
 
-func TestLoadEnvConfigVarsDR(t *testing.T) {
+func TestSetDRMinIncomingConfirmations(t *testing.T) {
 	t.Parallel()
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -59,15 +62,14 @@ func TestLoadEnvConfigVarsDR(t *testing.T) {
 		MinIncomingConfirmations: clnull.Uint32From(10),
 	}
 
-	drs10 := job.LoadEnvConfigVarsDR(chainConfig.EVM(), jobSpec10)
-	assert.True(t, drs10.MinIncomingConfirmationsEnv)
+	drs10 := job.SetDRMinIncomingConfirmations(chainConfig.EVM().MinIncomingConfirmations(), jobSpec10)
+	assert.Equal(t, uint32(100), drs10.MinIncomingConfirmations.Uint32)
 
 	jobSpec200 := job.DirectRequestSpec{
 		MinIncomingConfirmations: clnull.Uint32From(200),
 	}
 
-	drs200 := job.LoadEnvConfigVarsDR(chainConfig.EVM(), jobSpec200)
-	assert.False(t, drs200.MinIncomingConfirmationsEnv)
+	drs200 := job.SetDRMinIncomingConfirmations(chainConfig.EVM().MinIncomingConfirmations(), jobSpec200)
 	assert.True(t, drs200.MinIncomingConfirmations.Valid)
 	assert.Equal(t, uint32(200), drs200.MinIncomingConfirmations.Uint32)
 }

core/services/ocr/config.go

@@ -14,7 +14,7 @@ type Config interface {
 }
 
 func toLocalConfig(cfg ValidationConfig, evmOcrConfig evmconfig.OCR, insecureCfg insecureConfig, spec job.OCROracleSpec, ocrConfig job.OCRConfig) ocrtypes.LocalConfig {
-	concreteSpec := job.LoadEnvConfigVarsLocalOCR(evmOcrConfig, spec, ocrConfig)
+	concreteSpec := job.LoadConfigVarsLocalOCR(evmOcrConfig, spec, ocrConfig)
 	lc := ocrtypes.LocalConfig{
 		BlockchainTimeout:                      concreteSpec.BlockchainTimeout.Duration(),
 		ContractConfigConfirmations:            concreteSpec.ContractConfigConfirmations,

core/services/ocr/delegate.go

@@ -95,7 +95,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 	if err != nil {
 		return nil, err
 	}
-	concreteSpec, err := job.LoadEnvConfigVarsOCR(chain.Config().EVM().OCR(), chain.Config().OCR(), *jb.OCROracleSpec)
+	concreteSpec, err := job.LoadConfigVarsOCR(chain.Config().EVM().OCR(), chain.Config().OCR(), *jb.OCROracleSpec)
 	if err != nil {
 		return nil, err
 	}

core/services/vrf/v1/listener_v1.go

@@ -112,7 +112,7 @@ func (lsn *Listener) getLatestHead() uint64 {
 // Start complies with job.Service
 func (lsn *Listener) Start(context.Context) error {
 	return lsn.StartOnce("VRFListener", func() error {
-		spec := job.LoadEnvConfigVarsVRF(lsn.Cfg, *lsn.Job.VRFSpec)
+		spec := job.LoadDefaultVRFPollPeriod(*lsn.Job.VRFSpec)
 
 		unsubscribeLogs := lsn.LogBroadcaster.Register(lsn, log.ListenerOpts{
 			Contract: lsn.Coordinator.Address(),

core/services/vrf/v2/listener_v2.go

@@ -271,7 +271,7 @@ func (lsn *listenerV2) Start(ctx context.Context) error {
 				"proofVerificationGas", GasProofVerification)
 		}
 
-		spec := job.LoadEnvConfigVarsVRF(lsn.cfg, *lsn.job.VRFSpec)
+		spec := job.LoadDefaultVRFPollPeriod(*lsn.job.VRFSpec)
 
 		unsubscribeLogs := lsn.logBroadcaster.Register(lsn, log.ListenerOpts{
 			Contract:       lsn.coordinator.Address(),