core: misc cleanup and deprecation (#21552)

Author: jmank88

core/internal/cltest/cltest.go

@@ -50,7 +50,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/compute"
 
 	"github.com/smartcontractkit/chainlink-evm/pkg/assets"
-	"github.com/smartcontractkit/chainlink-evm/pkg/chains/legacyevm"
 	evmclient "github.com/smartcontractkit/chainlink-evm/pkg/client"
 	"github.com/smartcontractkit/chainlink-evm/pkg/client/clienttest"
 	"github.com/smartcontractkit/chainlink-evm/pkg/txmgr"
@@ -163,6 +162,7 @@ func init() {
 	}
 }
 
+// Deprecated: use rand/v2
 func NewRandomPositiveInt64() int64 {
 	id := rand.Int63()
 	return id
@@ -183,30 +183,6 @@ func FormatWithPrefixedChainID(chainID, id string) string {
 	return fmt.Sprintf("%s/%s", chainID, id)
 }
 
-type JobPipelineV2TestHelper struct {
-	Prm pipeline.ORM
-	Jrm job.ORM
-	Pr  pipeline.Runner
-}
-
-type JobPipelineConfig interface {
-	pipeline.Config
-	MaxSuccessfulRuns() uint64
-}
-
-func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipelineConfig, legacyChains legacyevm.LegacyChainContainer, db *sqlx.DB, keyStore keystore.Master, restrictedHTTPClient, unrestrictedHTTPClient *http.Client) JobPipelineV2TestHelper {
-	lggr := logger.TestLogger(t)
-	prm := pipeline.NewORM(db, lggr, jpcfg.MaxSuccessfulRuns())
-	btORM := bridges.NewORM(db)
-	jrm := job.NewORM(db, prm, btORM, keyStore, lggr)
-	pr := pipeline.NewRunner(prm, btORM, jpcfg, cfg, legacyChains, keyStore.Eth(), keyStore.VRF(), lggr, restrictedHTTPClient, unrestrictedHTTPClient)
-	return JobPipelineV2TestHelper{
-		prm,
-		jrm,
-		pr,
-	}
-}
-
 // TestApplication holds the test application and test servers
 type TestApplication struct {
 	t testing.TB

core/internal/testutils/testutils.go

@@ -98,6 +98,7 @@ func WaitTimeout(t *testing.T) time.Duration {
 }
 
 // Context returns a context with the test's deadline, if available.
+// Deprecated: use [testing.TB.Context] directly
 func Context(tb testing.TB) context.Context {
 	return tb.Context()
 }

core/services/chainlink/relayer_chain_interoperators.go

@@ -46,7 +46,9 @@ type LoopRelayerStorer interface {
 // LegacyChainer is an interface for getting legacy chains
 // This will be deprecated/removed when products depend only
 // on the relayer interface.
+// Deprecated: use the Relayer interface
 type LegacyChainer interface {
+	// Deprecated: use the relayer interface
 	LegacyEVMChains() legacyevm.LegacyChainContainer
 }
 
@@ -294,6 +296,7 @@ func (rs *CoreRelayerChainInteroperators) GetIDToRelayerMap() map[types.RelayID]
 
 // LegacyEVMChains returns a container with all the evm chains
 // TODO BCF-2511
+// Deprecated: use the Relayer interface
 func (rs *CoreRelayerChainInteroperators) LegacyEVMChains() legacyevm.LegacyChainContainer {
 	rs.mu.Lock()
 	defer rs.mu.Unlock()

core/services/keeper/integration_test.go

@@ -3,13 +3,15 @@ package keeper_test
 import (
 	"fmt"
 	"math/big"
+	"net/http"
 	"testing"
 	"time"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	"github.com/jmoiron/sqlx"
 	"github.com/onsi/gomega"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
@@ -20,6 +22,9 @@ import (
 	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
+	"github.com/smartcontractkit/chainlink/v2/core/bridges"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/basic_upkeep_contract"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/keeper_registry_logic1_3"
@@ -602,3 +607,27 @@ func TestMaxPerformDataSize(t *testing.T) {
 		g.Eventually(receivedBytes, 20*time.Second, cltest.DBPollingInterval).Should(gomega.Equal(smallPayload))
 	})
 }
+
+type JobPipelineV2TestHelper struct {
+	Prm pipeline.ORM
+	Jrm job.ORM
+	Pr  pipeline.Runner
+}
+
+type JobPipelineConfig interface {
+	pipeline.Config
+	MaxSuccessfulRuns() uint64
+}
+
+func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipelineConfig, legacyChains legacyevm.LegacyChainContainer, db *sqlx.DB, keyStore keystore.Master, restrictedHTTPClient, unrestrictedHTTPClient *http.Client) JobPipelineV2TestHelper {
+	lggr := logger.TestLogger(t)
+	prm := pipeline.NewORM(db, lggr, jpcfg.MaxSuccessfulRuns())
+	btORM := bridges.NewORM(db)
+	jrm := job.NewORM(db, prm, btORM, keyStore, lggr)
+	pr := pipeline.NewRunner(prm, btORM, jpcfg, cfg, legacyChains, keyStore.Eth(), keyStore.VRF(), lggr, restrictedHTTPClient, unrestrictedHTTPClient)
+	return JobPipelineV2TestHelper{
+		prm,
+		jrm,
+		pr,
+	}
+}

core/services/keeper/registry_synchronizer_helper_test.go

@@ -53,7 +53,7 @@ func setupRegistrySync(t *testing.T, version keeper.RegistryVersion) (
 		ListenerConfig: cfg.Database().Listener(),
 		KeyStore:       keyStore.Eth(),
 	})
-	jpv2 := cltest.NewJobPipelineV2(t, cfg.WebServer(), cfg.JobPipeline(), legacyChains, db, keyStore, nil, nil)
+	jpv2 := NewJobPipelineV2(t, cfg.WebServer(), cfg.JobPipeline(), legacyChains, db, keyStore, nil, nil)
 	contractAddress := j.KeeperSpec.ContractAddress.Address()
 
 	switch version {

core/services/keeper/upkeep_executer_test.go

@@ -49,7 +49,7 @@ func setup(t *testing.T, overrideFn func(c *chainlink.Config, s *chainlink.Secre
 	keeper.Registry,
 	keeper.UpkeepRegistration,
 	job.Job,
-	cltest.JobPipelineV2TestHelper,
+	JobPipelineV2TestHelper,
 	*txmmocks.MockEvmTxManager,
 	keystore.Master,
 	legacyevm.Chain,
@@ -78,7 +78,7 @@ func setup(t *testing.T, overrideFn func(c *chainlink.Config, s *chainlink.Secre
 		FeatureConfig:  cfg.Feature(),
 		ListenerConfig: cfg.Database().Listener(),
 	})
-	jpv2 := cltest.NewJobPipelineV2(t, cfg.WebServer(), cfg.JobPipeline(), legacyChains, db, keyStore, nil, nil)
+	jpv2 := NewJobPipelineV2(t, cfg.WebServer(), cfg.JobPipeline(), legacyChains, db, keyStore, nil, nil)
 	ch := evmtest.MustGetDefaultChain(t, legacyChains)
 	orm := keeper.NewORM(db, logger.TestLogger(t))
 	registry, jb := cltest.MustInsertKeeperRegistry(t, db, orm, keyStore.Eth(), 0, 1, 20)

core/services/relay/evm/relayer_extender.go

@@ -81,6 +81,8 @@ func NewLegacyChains(
 	}
 	return
 }
+
+// Deprecated: use the Relayer interface
 func NewLegacyChainsAndConfig(
 	lggr logger.Logger,
 	ks keystore.Eth,