[CRE-491] Use moved Interval type from common

core/bridges/orm_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -18,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 func setupORM(t *testing.T) (*sqlx.DB, bridges.ORM) {
@@ -144,7 +144,7 @@ func TestORM_TestCachedResponse(t *testing.T) {
 	orm := bridges.NewORM(db)
 
 	trORM := pipeline.NewORM(db, logger.TestLogger(t), cfg.JobPipeline().MaxSuccessfulRuns())
-	specID, err := trORM.CreateSpec(ctx, pipeline.Pipeline{}, *models.NewInterval(5 * time.Minute))
+	specID, err := trORM.CreateSpec(ctx, pipeline.Pipeline{}, *sqlutil.NewInterval(5 * time.Minute))
 	require.NoError(t, err)
 
 	_, err = orm.GetCachedResponse(ctx, "dot", specID, 1*time.Second)

core/capabilities/ccip/configs/evm/contract_reader.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
 	"github.com/smartcontractkit/chainlink-common/pkg/codec"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 
 	evmtypes "github.com/smartcontractkit/chainlink-evm/pkg/types"
 
@@ -24,7 +25,6 @@ import (
 	kcr "github.com/smartcontractkit/chainlink-evm/gethwrappers/keystone/generated/capabilities_registry_1_1_0"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/aggregator_v3_interface"
 	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 const (
@@ -74,7 +74,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 					mustGetEventName(consts.EventNameCommitReportAccepted, offrampABI),
 				},
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -135,7 +135,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: nonce_manager.NonceManagerABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -153,7 +153,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: fee_quoter.FeeQuoterABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -203,7 +203,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: rmn_remote.RMNRemoteABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -225,7 +225,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: rmn_proxy_contract.RMNProxyABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -239,7 +239,7 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: router.RouterABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -262,7 +262,7 @@ var SourceReaderConfig = evmrelaytypes.ChainReaderConfig{
 					consts.EventNameCCIPMessageSent,
 				},
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -308,7 +308,7 @@ var SourceReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: router.RouterABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -322,7 +322,7 @@ var SourceReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: fee_quoter.FeeQuoterABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -352,7 +352,7 @@ var SourceReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: rmn_remote.RMNRemoteABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -381,7 +381,7 @@ var FeedReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractABI: aggregator_v3_interface.AggregatorV3InterfaceABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -403,7 +403,7 @@ var USDCReaderConfig = evmrelaytypes.ChainReaderConfig{
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				GenericEventNames: []string{consts.EventNameCCTPMessageSent},
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -433,7 +433,7 @@ var HomeChainReaderConfigRaw = evmrelaytypes.ChainReaderConfig{
 			ContractABI: kcr.CapabilitiesRegistryABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -446,7 +446,7 @@ var HomeChainReaderConfigRaw = evmrelaytypes.ChainReaderConfig{
 			ContractABI: ccip_home.CCIPHomeABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{
@@ -462,7 +462,7 @@ var HomeChainReaderConfigRaw = evmrelaytypes.ChainReaderConfig{
 			ContractABI: rmn_home.RMNHomeABI,
 			ContractPollingFilter: evmrelaytypes.ContractPollingFilter{
 				PollingFilter: evmrelaytypes.PollingFilter{
-					Retention: models.Interval(DefaultCCIPLogsRetention),
+					Retention: sqlutil.Interval(DefaultCCIPLogsRetention),
 				},
 			},
 			Configs: map[string]*evmrelaytypes.ChainReaderDefinition{

core/cmd/jobs_commands_test.go

@@ -16,12 +16,12 @@ import (
 	"github.com/smartcontractkit/freeport"
 
 	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
 
@@ -33,7 +33,7 @@ func TestJobPresenter_RenderTable(t *testing.T) {
 		name            = "Job 1"
 		jobSpecType     = "fluxmonitor"
 		schemaVersion   = uint32(1)
-		maxTaskDuration = models.Interval(1 * time.Second)
+		maxTaskDuration = sqlutil.Interval(1 * time.Second)
 
 		createdAt = time.Now()
 		updatedAt = time.Now().Add(time.Second)

core/scripts/go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250930202440-88c08e65d960
-	github.com/smartcontractkit/chainlink-common v0.9.6-0.20250929154511-1f5fbda7ae76
+	github.com/smartcontractkit/chainlink-common v0.9.6-0.20251001150007-98903c79c124
 	github.com/smartcontractkit/chainlink-data-streams v0.1.2
 	github.com/smartcontractkit/chainlink-deployments-framework v0.52.0
 	github.com/smartcontractkit/chainlink-evm v0.3.4-0.20250915101441-709f87f7d401

core/scripts/go.sum

@@ -1597,8 +1597,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
-github.com/smartcontractkit/chainlink-common v0.9.6-0.20250929154511-1f5fbda7ae76 h1:Slnws8RoXRUYGgEMYK6X2yYzjZwNgVb93PxU45VEObQ=
-github.com/smartcontractkit/chainlink-common v0.9.6-0.20250929154511-1f5fbda7ae76/go.mod h1:1r3aM96KHAESfnayJ3BTHCkP1qJS1BEG1r4czeoaXlA=
+github.com/smartcontractkit/chainlink-common v0.9.6-0.20251001150007-98903c79c124 h1:rnt5y06fVvWngpQkJbFZjr3sIjvWDCpdETDIXzgwHnI=
+github.com/smartcontractkit/chainlink-common v0.9.6-0.20251001150007-98903c79c124/go.mod h1:1r3aM96KHAESfnayJ3BTHCkP1qJS1BEG1r4czeoaXlA=
 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4 h1:hvqATtrZ0iMRTI80cpBot/3JFbjz2j+2tvpfooVhRHw=
 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4/go.mod h1:eKGyfTKzr0/PeR7qKN4l2FcW9p+HzyKUwAfGhm/5YZc=
 github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=

core/services/job/helpers_test.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-evm/pkg/client/clienttest"
 	chainlinkevmbig "github.com/smartcontractkit/chainlink-evm/pkg/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -27,7 +28,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 const (
@@ -199,10 +199,10 @@ func compareOCRJobSpecs(t *testing.T, expected, actual job.Job) {
 func makeMinimalHTTPOracleSpec(t *testing.T, db *sqlx.DB, cfg chainlink.GeneralConfig, contractAddress, transmitterAddress, keyBundle, fetchUrl, timeout string) *job.Job {
 	var ocrSpec = job.OCROracleSpec{
 		P2PV2Bootstrappers:                     pq.StringArray{},
-		ObservationTimeout:                     models.Interval(10 * time.Second),
-		BlockchainTimeout:                      models.Interval(20 * time.Second),
-		ContractConfigTrackerSubscribeInterval: models.Interval(2 * time.Minute),
-		ContractConfigTrackerPollInterval:      models.Interval(1 * time.Minute),
+		ObservationTimeout:                     sqlutil.Interval(10 * time.Second),
+		BlockchainTimeout:                      sqlutil.Interval(20 * time.Second),
+		ContractConfigTrackerSubscribeInterval: sqlutil.Interval(2 * time.Minute),
+		ContractConfigTrackerPollInterval:      sqlutil.Interval(1 * time.Minute),
 		ContractConfigConfirmations:            uint16(3),
 		EVMChainID:                             chainlinkevmbig.New(testutils.FixtureChainID),
 	}

core/services/job/job_pipeline_orm_integration_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 
 	"github.com/smartcontractkit/chainlink-evm/pkg/client/clienttest"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
@@ -21,7 +22,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 func clearJobsDb(t *testing.T, db *sqlx.DB) {
@@ -135,7 +135,7 @@ func TestPipelineORM_Integration(t *testing.T) {
 		p, err := pipeline.Parse(DotStr)
 		require.NoError(t, err)
 
-		specID, err = orm.CreateSpec(ctx, *p, models.Interval(0))
+		specID, err = orm.CreateSpec(ctx, *p, sqlutil.Interval(0))
 		require.NoError(t, err)
 
 		var pipelineSpecs []pipeline.Spec

core/services/job/models.go

@@ -17,6 +17,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk"
 
@@ -190,7 +191,7 @@ type Job struct {
 	GasLimit                      clnull.Uint32 `toml:"gasLimit"`
 	ForwardingAllowed             bool          `toml:"forwardingAllowed"`
 	Name                          null.String   `toml:"name"`
-	MaxTaskDuration               models.Interval
+	MaxTaskDuration               sqlutil.Interval
 	Pipeline                      pipeline.Pipeline `toml:"observationSource"`
 	CreatedAt                     time.Time
 }
@@ -279,15 +280,15 @@ type OCROracleSpec struct {
 	IsBootstrapPeer                        bool                   `toml:"isBootstrapPeer"`
 	EncryptedOCRKeyBundleID                *models.Sha256Hash     `toml:"keyBundleID"`
 	TransmitterAddress                     *evmtypes.EIP55Address `toml:"transmitterAddress"`
-	ObservationTimeout                     models.Interval        `toml:"observationTimeout"`
-	BlockchainTimeout                      models.Interval        `toml:"blockchainTimeout"`
-	ContractConfigTrackerSubscribeInterval models.Interval        `toml:"contractConfigTrackerSubscribeInterval"`
-	ContractConfigTrackerPollInterval      models.Interval        `toml:"contractConfigTrackerPollInterval"`
+	ObservationTimeout                     sqlutil.Interval       `toml:"observationTimeout"`
+	BlockchainTimeout                      sqlutil.Interval       `toml:"blockchainTimeout"`
+	ContractConfigTrackerSubscribeInterval sqlutil.Interval       `toml:"contractConfigTrackerSubscribeInterval"`
+	ContractConfigTrackerPollInterval      sqlutil.Interval       `toml:"contractConfigTrackerPollInterval"`
 	ContractConfigConfirmations            uint16                 `toml:"contractConfigConfirmations"`
 	EVMChainID                             *big.Big               `toml:"evmChainID" db:"evm_chain_id"`
-	DatabaseTimeout                        *models.Interval       `toml:"databaseTimeout"`
-	ObservationGracePeriod                 *models.Interval       `toml:"observationGracePeriod"`
-	ContractTransmitterTransmitTimeout     *models.Interval       `toml:"contractTransmitterTransmitTimeout"`
+	DatabaseTimeout                        *sqlutil.Interval      `toml:"databaseTimeout"`
+	ObservationGracePeriod                 *sqlutil.Interval      `toml:"observationGracePeriod"`
+	ContractTransmitterTransmitTimeout     *sqlutil.Interval      `toml:"contractTransmitterTransmitTimeout"`
 	CaptureEATelemetry                     bool                   `toml:"captureEATelemetry"`
 	CreatedAt                              time.Time              `toml:"-"`
 	UpdatedAt                              time.Time              `toml:"-"`
@@ -377,8 +378,8 @@ type OCR2OracleSpec struct {
 	OCRKeyBundleID                    null.String          `toml:"ocrKeyBundleID"`
 	MonitoringEndpoint                null.String          `toml:"monitoringEndpoint"`
 	TransmitterID                     null.String          `toml:"transmitterID"`
-	BlockchainTimeout                 models.Interval      `toml:"blockchainTimeout"`
-	ContractConfigTrackerPollInterval models.Interval      `toml:"contractConfigTrackerPollInterval"`
+	BlockchainTimeout                 sqlutil.Interval     `toml:"blockchainTimeout"`
+	ContractConfigTrackerPollInterval sqlutil.Interval     `toml:"contractConfigTrackerPollInterval"`
 	ContractConfigConfirmations       uint16               `toml:"contractConfigConfirmations"`
 	OnchainSigningStrategy            JSONConfig           `toml:"onchainSigningStrategy"`
 	PluginConfig                      JSONConfig           `toml:"pluginConfig"`
@@ -781,12 +782,12 @@ type BootstrapSpec struct {
 	FeedID                            *common.Hash `toml:"feedID"`
 	Relay                             string       `toml:"relay"` // RelayID.Network
 	RelayConfig                       JSONConfig
-	MonitoringEndpoint                null.String     `toml:"monitoringEndpoint"`
-	BlockchainTimeout                 models.Interval `toml:"blockchainTimeout"`
-	ContractConfigTrackerPollInterval models.Interval `toml:"contractConfigTrackerPollInterval"`
-	ContractConfigConfirmations       uint16          `toml:"contractConfigConfirmations"`
-	CreatedAt                         time.Time       `toml:"-"`
-	UpdatedAt                         time.Time       `toml:"-"`
+	MonitoringEndpoint                null.String      `toml:"monitoringEndpoint"`
+	BlockchainTimeout                 sqlutil.Interval `toml:"blockchainTimeout"`
+	ContractConfigTrackerPollInterval sqlutil.Interval `toml:"contractConfigTrackerPollInterval"`
+	ContractConfigConfirmations       uint16           `toml:"contractConfigConfirmations"`
+	CreatedAt                         time.Time        `toml:"-"`
+	UpdatedAt                         time.Time        `toml:"-"`
 }
 
 // AsOCR2Spec transforms the bootstrap spec into a generic OCR2 format to enable code sharing between specs.

core/services/job/models_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/pelletier/go-toml/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/codec"
+	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	pkgworkflows "github.com/smartcontractkit/chainlink-common/pkg/workflows"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -21,7 +22,6 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 func TestStandardCapabilitiesSpec_Deserialization(t *testing.T) {
@@ -144,7 +144,7 @@ func TestOCR2OracleSpec(t *testing.T) {
 		OCRKeyBundleID:                    null.StringFrom("bar"),
 		TransmitterID:                     null.StringFrom("baz"),
 		ContractConfigConfirmations:       1,
-		ContractConfigTrackerPollInterval: *models.NewInterval(time.Second),
+		ContractConfigTrackerPollInterval: *sqlutil.NewInterval(time.Second),
 		RelayConfig: map[string]interface{}{
 			"chainID":   1337,
 			"fromBlock": 42,