From f057105910b739c49c5d14a549a5ca53e222cdd6 Mon Sep 17 00:00:00 2001
From: AnieeG <anindita.ghosh@smartcontract.com>
Date: Wed, 27 Sep 2023 21:12:03 -0700
Subject: [PATCH] compilation fix

---
 .../ccip/testhelpers/integration/chainlink.go | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go b/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go
index 1b92a30996..2c8680da14 100644
--- a/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go
+++ b/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-relay/pkg/loop"
 	ctfClient "github.com/smartcontractkit/chainlink/integration-tests/client"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	v2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
@@ -274,10 +275,12 @@ func setupNodeCCIP(
 		}
 		c.Log.Level = &loglevel
 		c.Feature.CCIP = &trueRef
+		c.Feature.UICSAKeys = &trueRef
 		c.OCR.Enabled = &falseRef
 		c.OCR.DefaultTransactionQueueDepth = pointer.Uint32(200)
 		c.OCR2.Enabled = &trueRef
 		c.Feature.LogPoller = &trueRef
+		c.P2P.V1.Enabled = &falseRef
 		c.P2P.V2.Enabled = &trueRef
 		c.P2P.V2.DeltaDial = models.MustNewDuration(500 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
@@ -317,7 +320,7 @@ func setupNodeCCIP(
 	}
 	mailMon := utils.NewMailboxMonitor("CCIP")
 	evmOpts := chainlink.EVMFactoryConfig{
-		RelayerConfig: &evm.RelayerConfig{
+		ChainOpts: evm.ChainOpts{
 			AppConfig:        config,
 			EventBroadcaster: eventBroadcaster,
 			GenEthClient: func(chainID *big.Int) client.Client {
@@ -330,14 +333,13 @@ func setupNodeCCIP(
 				return nil
 			},
 			MailMon: mailMon,
+			DB:      db,
 		},
 		CSAETHKeystore: simEthKeyStore,
 	}
 	loopRegistry := plugins.NewLoopRegistry(lggr.Named("LoopRegistry"))
 	relayerFactory := chainlink.RelayerFactory{
 		Logger:       lggr,
-		DB:           db,
-		QConfig:      config.Database(),
 		LoopRegistry: loopRegistry,
 		GRPCOpts:     loop.GRPCOpts{},
 	}
@@ -358,13 +360,12 @@ func setupNodeCCIP(
 		RelayerChainInteroperators: relayChainInterops,
 		Logger:                     lggr,
 		ExternalInitiatorManager:   nil,
-		CloseLogger: func() error {
-			return nil
-		},
-		UnrestrictedHTTPClient: &http.Client{},
-		RestrictedHTTPClient:   &http.Client{},
-		AuditLogger:            audit.NoopLogger,
-		MailMon:                mailMon,
+		CloseLogger:                lggr.Sync,
+		UnrestrictedHTTPClient:     &http.Client{},
+		RestrictedHTTPClient:       &http.Client{},
+		AuditLogger:                audit.NoopLogger,
+		MailMon:                    mailMon,
+		LoopRegistry:               plugins.NewLoopRegistry(lggr),
 	})
 	require.NoError(t, err)
 	require.NoError(t, app.GetKeyStore().Unlock("password"))