Extract common

core/services/pipeline/models.go

@@ -19,6 +19,10 @@ import (
 
 type Spec = common.Spec
 
+func SpecPipeline(s Spec) (*Pipeline, error) {
+	return Parse(s.DotDagSource)
+}
+
 type Run struct {
 	ID             int64            `json:"-"`
 	PipelineSpecID int32            `json:"-"`

core/services/vrf/delegate.go

@@ -76,7 +76,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 	if jb.VRFSpec == nil || jb.PipelineSpec == nil {
 		return nil, errors.Errorf("vrf.Delegate expects a VRFSpec and PipelineSpec to be present, got %+v", jb)
 	}
-	pl, err := jb.PipelineSpec.Pipeline()
+	pl, err := pipeline.SpecPipeline(*jb.PipelineSpec)
 	if err != nil {
 		return nil, err
 	}

core/store/models/common.go

@@ -17,6 +17,7 @@ import (
 	"github.com/tidwall/gjson"
 	"go.uber.org/multierr"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
@@ -311,7 +312,7 @@ func (d *Duration) UnmarshalText(input []byte) error {
 }
 
 // Interval represents a time.Duration stored as a Postgres interval type
-type Interval time.Duration
+type Interval = utils.Interval
 
 // NewInterval creates Interval for specified duration
 func NewInterval(d time.Duration) *Interval {
@@ -320,46 +321,6 @@ func NewInterval(d time.Duration) *Interval {
 	return i
 }
 
-func (i Interval) Duration() time.Duration {
-	return time.Duration(i)
-}
-
-// MarshalText implements the text.Marshaler interface.
-func (i Interval) MarshalText() ([]byte, error) {
-	return []byte(time.Duration(i).String()), nil
-}
-
-// UnmarshalText implements the text.Unmarshaler interface.
-func (i *Interval) UnmarshalText(input []byte) error {
-	v, err := time.ParseDuration(string(input))
-	if err != nil {
-		return err
-	}
-	*i = Interval(v)
-	return nil
-}
-
-func (i *Interval) Scan(v interface{}) error {
-	if v == nil {
-		*i = Interval(time.Duration(0))
-		return nil
-	}
-	asInt64, is := v.(int64)
-	if !is {
-		return errors.Errorf("models.Interval#Scan() wanted int64, got %T", v)
-	}
-	*i = Interval(time.Duration(asInt64) * time.Nanosecond)
-	return nil
-}
-
-func (i Interval) Value() (driver.Value, error) {
-	return time.Duration(i).Nanoseconds(), nil
-}
-
-func (i Interval) IsZero() bool {
-	return time.Duration(i) == time.Duration(0)
-}
-
 // SendEtherRequest represents a request to transfer ETH.
 type SendEtherRequest struct {
 	DestinationAddress common.Address `json:"address"`