Revert "cleaning up delve entrypoint integ tests and minor refactorin…

…g for clarity" This reverts commit 6cec7f1.
smartcontractkit · Sep 26, 2024 · bdd5c9a · bdd5c9a
1 parent b323a8b
commit bdd5c9a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 36 deletions.
diff --git a/core/services/ocr2/plugins/ccip/internal/pricegetter/evm.go b/core/services/ocr2/plugins/ccip/internal/pricegetter/evm.go
@@ -149,7 +149,6 @@ func (d *DynamicPriceGetter) performBatchCalls(ctx context.Context, batchCallsPe
 func (d *DynamicPriceGetter) performBatchCall(ctx context.Context, chainID uint64, batchCalls *batchCallsForChain, prices map[cciptypes.Address]*big.Int) (err error) {
 	nbDecimalCalls := len(batchCalls.decimalCalls)
 	nbLatestRoundDataCalls := len(batchCalls.decimalCalls)
-	nbCalls := len(batchCalls.decimalCalls)
 
 	// Retrieve contract reader for the chain
 	contractReader := d.contractReaders[chainID]
@@ -199,7 +198,7 @@ func (d *DynamicPriceGetter) performBatchCall(ctx context.Context, chainID uint6
 	decimalsCR := make([]uint8, 0, nbDecimalCalls)
 	latestRoundCR := make([]aggregator_v3_interface.LatestRoundData, 0, nbDecimalCalls)
 	var respErr error
-	for j := range nbCalls {
+	for j := range nbDecimalCalls {
 		contractName := fmt.Sprintf("%v_%v", OFFCHAIN_AGGREGATOR, j)
 		offchainAggregatorRespSlice := result[contractName]
 

diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
@@ -54,7 +54,6 @@ type ClNode struct {
 	UserEmail             string                  `json:"userEmail"`
 	UserPassword          string                  `json:"userPassword"`
 	AlwaysPullImage       bool                    `json:"-"`
-	RemoteDebugger        bool                    `json:"-"`
 	t                     *testing.T
 	l                     zerolog.Logger
 }
@@ -146,8 +145,6 @@ func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *ch
 		NodeConfig:   nodeConfig,
 		PostgresDb:   pgDb,
 		l:            log.Logger,
-		// TODO CCIP-3447 drill user specified config through to set RemoteDebugger
-		RemoteDebugger: false,
 	}
 	n.SetDefaultHooks()
 	for _, opt := range opts {
@@ -445,43 +442,30 @@ func (n *ClNode) getContainerRequest(secrets string) (
 	adminCredsPath := "/home/admin-credentials.txt"
 	apiCredsPath := "/home/api-credentials.txt"
 
-	entrypoint := []string{
-		"chainlink",
-		"-c", configPath,
-		"-s", secretsPath,
-		"node", "start", "-d",
-		"-p", adminCredsPath,
-		"-a", apiCredsPath,
-	}
-
-	if n.RemoteDebugger {
-		entrypoint = []string{
-			"/home/chainlink/go/bin/dlv",
-			"exec",
-			"/usr/local/bin/chainlink",
-			"--accept-multiclient",
-			"--headless",
-			"--listen=0.0.0.0:40000",
-			"--api-version=2",
-			"--continue",
-			"--",
-			"chainlink",
-			"-c", configPath,
-			"-s", secretsPath,
-			"node", "start", "-d",
-			"-p", adminCredsPath,
-			"-a", apiCredsPath,
-		}
-	}
-
 	return &tc.ContainerRequest{
 		Name:            n.ContainerName,
 		AlwaysPullImage: n.AlwaysPullImage,
 		Image:           fmt.Sprintf("%s:%s", n.ContainerImage, n.ContainerVersion),
 		ExposedPorts:    []string{"6688/tcp", test_env.NatPortFormat("40000")},
 		Env:             n.ContainerEnvs,
-		Entrypoint:      entrypoint,
-		Networks:        append(n.Networks, "tracing"),
+		Entrypoint: []string{
+			//"/home/chainlink/go/bin/dlv",
+			//"exec",
+			//"/usr/local/bin/chainlink",
+			//"--accept-multiclient",
+			//"--headless",
+			//"--listen=0.0.0.0:40000",
+			//"--api-version=2",
+			//"--continue",
+			//"--",
+			"chainlink",
+			"-c", configPath,
+			"-s", secretsPath,
+			"node", "start", "-d",
+			"-p", adminCredsPath,
+			"-a", apiCredsPath,
+		},
+		Networks: append(n.Networks, "tracing"),
 		WaitingFor: tcwait.ForHTTP("/readyz").
 			WithPort("6688/tcp").
 			WithStartupTimeout(n.StartupTimeout).