merge conflict fix

integration-tests/smoke/keeper_test.go

@@ -1154,7 +1154,7 @@ func TestKeeperJobReplacement(t *testing.T) {
 	gom.Eventually(func(g gomega.Gomega) error {
 		// Check if the upkeeps are performing multiple times by analyzing their counters and checking they are greater than 10
 		for i := 0; i < len(upkeepIDs); i++ {
-			counter, err := consumers[i].Counter(utils.TestContext(t))
+			counter, err := consumers[i].Counter(testcontext.Get(t))
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Failed to retrieve consumer counter for upkeep at index %d", i)
 			g.Expect(counter.Int64()).Should(gomega.BeNumerically(">", int64(10)),
 				"Expected consumer counter to be greater than 10, but got %d", counter.Int64())
@@ -1183,7 +1183,7 @@ func TestKeeperJobReplacement(t *testing.T) {
 	gom.Eventually(func(g gomega.Gomega) error {
 		// Check if the upkeeps are performing multiple times by analyzing their counters and checking they are greater than 10
 		for i := 0; i < len(upkeepIDs); i++ {
-			counter, err := consumers[i].Counter(utils.TestContext(t))
+			counter, err := consumers[i].Counter(testcontext.Get(t))
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Failed to retrieve consumer counter for upkeep at index %d", i)
 			g.Expect(counter.Int64()).Should(gomega.BeNumerically(">", int64(10)),
 				"Expected consumer counter to be greater than 10, but got %d", counter.Int64())

integration-tests/smoke/ocr2_test.go

@@ -146,7 +146,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 
 	err = actions.StartNewOCR2Round(1, aggregatorContracts, env.EVMClient, time.Minute*5, l)
 	require.NoError(t, err, "Error starting new OCR2 round")
-	roundData, err := aggregatorContracts[0].GetRound(utils.TestContext(t), big.NewInt(1))
+	roundData, err := aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(1))
 	require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
 	require.Equal(t, int64(5), roundData.Answer.Int64(),
 		"Expected latest answer from OCR contract to be 5 but got %d",
@@ -158,7 +158,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 	err = actions.StartNewOCR2Round(2, aggregatorContracts, env.EVMClient, time.Minute*5, l)
 	require.NoError(t, err)
 
-	roundData, err = aggregatorContracts[0].GetRound(utils.TestContext(t), big.NewInt(2))
+	roundData, err = aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(2))
 	require.NoError(t, err, "Error getting latest OCR answer")
 	require.Equal(t, int64(10), roundData.Answer.Int64(),
 		"Expected latest answer from OCR contract to be 10 but got %d",
@@ -176,7 +176,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 
 	err = actions.StartNewOCR2Round(3, aggregatorContracts, env.EVMClient, time.Minute*3, l)
 	require.NoError(t, err, "Error starting new OCR2 round")
-	roundData, err = aggregatorContracts[0].GetRound(utils.TestContext(t), big.NewInt(3))
+	roundData, err = aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(3))
 	require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
 	require.Equal(t, int64(15), roundData.Answer.Int64(),
 		"Expected latest answer from OCR contract to be 15 but got %d",

integration-tests/smoke/ocr_test.go

@@ -92,7 +92,7 @@ func TestOCRJobReplacement(t *testing.T) {
 	err = actions.StartNewRound(1, ocrInstances, env.EVMClient, l)
 	require.NoError(t, err)
 
-	answer, err := ocrInstances[0].GetLatestAnswer(utils.TestContext(t))
+	answer, err := ocrInstances[0].GetLatestAnswer(testcontext.Get(t))
 	require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
 	require.Equal(t, int64(5), answer.Int64(), "Expected latest answer from OCR contract to be 5 but got %d", answer.Int64())
 
@@ -101,7 +101,7 @@ func TestOCRJobReplacement(t *testing.T) {
 	err = actions.StartNewRound(2, ocrInstances, env.EVMClient, l)
 	require.NoError(t, err)
 
-	answer, err = ocrInstances[0].GetLatestAnswer(utils.TestContext(t))
+	answer, err = ocrInstances[0].GetLatestAnswer(testcontext.Get(t))
 	require.NoError(t, err, "Error getting latest OCR answer")
 	require.Equal(t, int64(10), answer.Int64(), "Expected latest answer from OCR contract to be 10 but got %d", answer.Int64())
 
@@ -118,7 +118,7 @@ func TestOCRJobReplacement(t *testing.T) {
 	err = actions.StartNewRound(1, ocrInstances, env.EVMClient, l)
 	require.NoError(t, err)
 
-	answer, err = ocrInstances[0].GetLatestAnswer(utils.TestContext(t))
+	answer, err = ocrInstances[0].GetLatestAnswer(testcontext.Get(t))
 	require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
 	require.Equal(t, int64(10), answer.Int64(), "Expected latest answer from OCR contract to be 10 but got %d", answer.Int64())
 

integration-tests/smoke/vrf_test.go

@@ -170,7 +170,7 @@ func TestVRFJobReplacement(t *testing.T) {
 		encodedProvingKeys := make([][2]*big.Int, 0)
 		encodedProvingKeys = append(encodedProvingKeys, provingKey)
 
-		requestHash, err := contracts.Coordinator.HashOfKey(utils.TestContext(t), encodedProvingKeys[0])
+		requestHash, err := contracts.Coordinator.HashOfKey(testcontext.Get(t), encodedProvingKeys[0])
 		require.NoError(t, err, "Getting Hash of encoded proving keys shouldn't fail")
 		err = contracts.Consumer.RequestRandomness(requestHash, big.NewInt(1))
 		require.NoError(t, err, "Requesting randomness shouldn't fail")
@@ -181,7 +181,7 @@ func TestVRFJobReplacement(t *testing.T) {
 			jobRuns, err := env.ClCluster.Nodes[0].API.MustReadRunsByJob(job.Data.ID)
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Job execution shouldn't fail")
 
-			out, err := contracts.Consumer.RandomnessOutput(utils.TestContext(t))
+			out, err := contracts.Consumer.RandomnessOutput(testcontext.Get(t))
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Getting the randomness output of the consumer shouldn't fail")
 			// Checks that the job has actually run
 			g.Expect(len(jobRuns.Data)).Should(gomega.BeNumerically(">=", 1),
@@ -208,7 +208,7 @@ func TestVRFJobReplacement(t *testing.T) {
 			jobRuns, err := env.ClCluster.Nodes[0].API.MustReadRunsByJob(job.Data.ID)
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Job execution shouldn't fail")
 
-			out, err := contracts.Consumer.RandomnessOutput(utils.TestContext(t))
+			out, err := contracts.Consumer.RandomnessOutput(testcontext.Get(t))
 			g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Getting the randomness output of the consumer shouldn't fail")
 			// Checks that the job has actually run
 			g.Expect(len(jobRuns.Data)).Should(gomega.BeNumerically(">=", 1),

integration-tests/testsetups/keeper_benchmark.go

@@ -319,7 +319,7 @@ func (k *KeeperBenchmarkTest) Run() {
 			// This RPC call can possibly time out or otherwise die. Failure is not an option, keep retrying to get our stats.
 			err = fmt.Errorf("initial error") // to ensure our for loop runs at least once
 			for err != nil {
-			ctx, cancel := context.WithTimeout(testcontext.Get(k.t), timeout)
+				ctx, cancel := context.WithTimeout(testcontext.Get(k.t), timeout)
 				logs, err = k.chainClient.FilterLogs(ctx, filterQuery)
 				cancel()
 				if err != nil {

integration-tests/types/config/node/core.go

@@ -14,6 +14,7 @@ import (
 	relayassets "github.com/smartcontractkit/chainlink-relay/pkg/assets"
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/ptr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"

integration-tests/utils/common.go

@@ -31,7 +31,3 @@ func BigIntSliceContains(slice []*big.Int, b *big.Int) bool {
 	}
 	return false
 }
-		// Return background context if testing.T not set
-		if t == nil {
-			return ctx
-		}