Merge develop and resolve conflicts

smartcontractkit · Nov 21, 2024 · 9e23e36 · 9e23e36
2 parents a91efc8 + 29eb755
commit 9e23e36
Show file tree

Hide file tree

Showing 42 changed files with 1,618 additions and 386 deletions.
diff --git a/.changeset/chilly-stingrays-press.md b/.changeset/chilly-stingrays-press.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Removing ccip-tests/\* dependencies and moving ccip tests under a directory in smoke
diff --git a/.changeset/eight-tigers-march.md b/.changeset/eight-tigers-march.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added Adding 5 chains (B^2, BoB, Berachain, Unichain, Worldchain configs)
diff --git a/.changeset/great-peaches-walk.md b/.changeset/great-peaches-walk.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+fix reported evm node states
diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -935,83 +935,83 @@ runner-test-matrix:
 
   # START: CCIPv1.6 tests
 
-  - id: smoke/ccip_test.go:*
-    path: integration-tests/smoke/ccip_test.go
+  - id: smoke/ccip/ccip_test.go:*
+    path: integration-tests/smoke/ccip/ccip_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip_test.go -timeout 12m -test.parallel=3 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_test.go -timeout 12m -test.parallel=3 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
       PG_INSTANCE: true
       NO_CACHE: true
 
-  - id: smoke/ccip_messaging_test.go:*
-    path: integration-tests/smoke/ccip_messaging_test.go
+  - id: smoke/ccip/ccip_messaging_test.go:*
+    path: integration-tests/smoke/ccip/ccip_messaging_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip_messaging_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_messaging_test.go -timeout 15m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip_usdc_test.go:*
-    path: integration-tests/smoke/ccip_usdc_test.go
+  - id: smoke/ccip/ccip_usdc_test.go:*
+    path: integration-tests/smoke/ccip/ccip_usdc_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip_usdc_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_usdc_test.go -timeout 18m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/fee_boosting_test.go:*
-    path: integration-tests/smoke/fee_boosting_test.go
+  - id: smoke/ccip/fee_boosting_test.go:*
+    path: integration-tests/smoke/ccip/fee_boosting_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/fee_boosting_test.go -timeout 15m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test fee_boosting_test.go -timeout 15m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
-    path: integration-tests/smoke/ccip_rmn_test.go
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$ -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$ -timeout 12m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-5208d09
       E2E_RMN_AFN2PROXY_VERSION: master-5208d09
 
-  - id: smoke/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
-    path: integration-tests/smoke/ccip_rmn_test.go
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$ -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$ -timeout 12m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
@@ -1020,29 +1020,29 @@ runner-test-matrix:
       E2E_RMN_AFN2PROXY_VERSION: master-5208d09
 
 # Enable after flaking issue is resolved
-#  - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
-#    path: integration-tests/smoke/ccip_rmn_test.go
+#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
+#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
 #    test_env_type: docker
 #    runs_on: ubuntu-latest
 #    triggers:
 #      - PR E2E Core Tests
 #      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json
+#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json
 #    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
 #      E2E_JD_VERSION: 0.6.0
 #      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
 #      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
 
-  - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentSigners$
-    path: integration-tests/smoke/ccip_rmn_test.go
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_DifferentSigners$ -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_DifferentSigners$ -timeout 12m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
@@ -1051,14 +1051,14 @@ runner-test-matrix:
       E2E_RMN_AFN2PROXY_VERSION: master-5208d09
 
 # Enable after flaking issue is resolved
-#  - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
-#    path: integration-tests/smoke/ccip_rmn_test.go
+#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
+#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
 #    test_env_type: docker
 #    runs_on: ubuntu-latest
 #    triggers:
 #      - PR E2E Core Tests
 #      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json
+#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json
 #    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
@@ -1067,14 +1067,14 @@ runner-test-matrix:
 #      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
 
 
-  - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
-    path: integration-tests/smoke/ccip_rmn_test.go
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ && go test -test.run ^TestRMN_DifferentRmnNodesForDifferentChains$ -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_DifferentRmnNodesForDifferentChains$ -timeout 12m -test.parallel=1 -count=1 -json
     pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2

diff --git a/common/client/multi_node.go b/common/client/multi_node.go
@@ -131,10 +131,10 @@ func (c *MultiNode[CHAIN_ID, RPC]) DoAll(ctx context.Context, do func(ctx contex
 func (c *MultiNode[CHAIN_ID, RPC]) NodeStates() map[string]string {
 	states := map[string]string{}
 	for _, n := range c.primaryNodes {
-		states[n.String()] = n.State().String()
+		states[n.Name()] = n.State().String()
 	}
 	for _, n := range c.sendOnlyNodes {
-		states[n.String()] = n.State().String()
+		states[n.Name()] = n.State().String()
 	}
 	return states
 }

diff --git a/common/client/multi_node_test.go b/common/client/multi_node_test.go
@@ -308,13 +308,13 @@ func TestMultiNode_CheckLease(t *testing.T) {
 		for name, state := range nodes {
 			node := newMockNode[types.ID, multiNodeRPCClient](t)
 			node.On("State").Return(state).Once()
-			node.On("String").Return(name).Once()
+			node.On("Name").Return(name).Once()
 			opts.nodes = append(opts.nodes, node)
 
 			sendOnly := newMockSendOnlyNode[types.ID, multiNodeRPCClient](t)
 			sendOnlyName := "send_only_" + name
 			sendOnly.On("State").Return(state).Once()
-			sendOnly.On("String").Return(sendOnlyName).Once()
+			sendOnly.On("Name").Return(sendOnlyName).Once()
 			opts.sendonlys = append(opts.sendonlys, sendOnly)
 
 			expectedResult[name] = state.String()

diff --git a/core/capabilities/remote/executable/client.go b/core/capabilities/remote/executable/client.go
@@ -140,40 +140,10 @@ func (c *client) Info(ctx context.Context) (commoncap.CapabilityInfo, error) {
 }
 
 func (c *client) RegisterToWorkflow(ctx context.Context, registerRequest commoncap.RegisterToWorkflowRequest) error {
-	req, err := request.NewClientRegisterToWorkflowRequest(ctx, c.lggr, registerRequest, c.remoteCapabilityInfo, c.localDONInfo, c.dispatcher,
-		c.requestTimeout)
-
-	if err != nil {
-		return fmt.Errorf("failed to create client request: %w", err)
-	}
-
-	if err = c.sendRequest(req); err != nil {
-		return fmt.Errorf("failed to send request: %w", err)
-	}
-
-	resp := <-req.ResponseChan()
-	if resp.Err != nil {
-		return fmt.Errorf("error executing request: %w", resp.Err)
-	}
 	return nil
 }
 
 func (c *client) UnregisterFromWorkflow(ctx context.Context, unregisterRequest commoncap.UnregisterFromWorkflowRequest) error {
-	req, err := request.NewClientUnregisterFromWorkflowRequest(ctx, c.lggr, unregisterRequest, c.remoteCapabilityInfo,
-		c.localDONInfo, c.dispatcher, c.requestTimeout)
-
-	if err != nil {
-		return fmt.Errorf("failed to create client request: %w", err)
-	}
-
-	if err = c.sendRequest(req); err != nil {
-		return fmt.Errorf("failed to send request: %w", err)
-	}
-
-	resp := <-req.ResponseChan()
-	if resp.Err != nil {
-		return fmt.Errorf("error executing request: %w", resp.Err)
-	}
 	return nil
 }
 

diff --git a/core/capabilities/remote/executable/endtoend_test.go b/core/capabilities/remote/executable/endtoend_test.go
@@ -26,84 +26,6 @@ import (
 	p2ptypes "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types"
 )
 
-func Test_RemoteExecutableCapability_InsufficientCapabilityResponses(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	responseTest := func(t *testing.T, responseCh commoncap.CapabilityResponse, responseError error) {
-		assert.NotNil(t, responseError)
-	}
-
-	capability := &TestCapability{}
-
-	transmissionSchedule, err := values.NewMap(map[string]any{
-		"schedule":   transmission.Schedule_AllAtOnce,
-		"deltaStage": "10ms",
-	})
-	require.NoError(t, err)
-
-	var methods []func(ctx context.Context, caller commoncap.ExecutableCapability)
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		executeCapability(ctx, t, caller, transmissionSchedule, responseTest)
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		registerWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			require.Error(t, responseError)
-		})
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		unregisterWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			require.Error(t, responseError)
-		})
-	})
-
-	for _, method := range methods {
-		testRemoteExecutableCapability(ctx, t, capability, 10, 9, 10*time.Millisecond, 10, 10, 10*time.Minute, method)
-	}
-}
-
-func Test_RemoteExecutableCapability_InsufficientWorkflowRequests(t *testing.T) {
-	ctx := testutils.Context(t)
-
-	responseTest := func(t *testing.T, responseCh commoncap.CapabilityResponse, responseError error) {
-		assert.NotNil(t, responseError)
-	}
-
-	timeOut := 10 * time.Minute
-
-	capability := &TestCapability{}
-
-	transmissionSchedule, err := values.NewMap(map[string]any{
-		"schedule":   transmission.Schedule_AllAtOnce,
-		"deltaStage": "10ms",
-	})
-	require.NoError(t, err)
-
-	var methods []func(ctx context.Context, caller commoncap.ExecutableCapability)
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		executeCapability(ctx, t, caller, transmissionSchedule, responseTest)
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		registerWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			require.Error(t, responseError)
-		})
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		unregisterWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			require.Error(t, responseError)
-		})
-	})
-
-	for _, method := range methods {
-		testRemoteExecutableCapability(ctx, t, capability, 10, 10, 10*time.Millisecond, 10, 9, timeOut, method)
-	}
-}
-
 func Test_RemoteExecutableCapability_TransmissionSchedules(t *testing.T) {
 	ctx := testutils.Context(t)
 
@@ -214,18 +136,6 @@ func Test_RemoteExecutionCapability_CapabilityError(t *testing.T) {
 		})
 	})
 
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		registerWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			assert.Equal(t, "error executing request: failed to register to workflow: an error", responseError.Error())
-		})
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		unregisterWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			assert.Equal(t, "error executing request: failed to unregister from workflow: an error", responseError.Error())
-		})
-	})
-
 	for _, method := range methods {
 		testRemoteExecutableCapability(ctx, t, capability, 10, 9, 10*time.Minute, 10, 9, 10*time.Minute, method)
 	}
@@ -250,18 +160,6 @@ func Test_RemoteExecutableCapability_RandomCapabilityError(t *testing.T) {
 		})
 	})
 
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		registerWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			assert.Equal(t, "error executing request: request expired", responseError.Error())
-		})
-	})
-
-	methods = append(methods, func(ctx context.Context, caller commoncap.ExecutableCapability) {
-		unregisterWorkflow(ctx, t, caller, transmissionSchedule, func(t *testing.T, responseError error) {
-			assert.Equal(t, "error executing request: request expired", responseError.Error())
-		})
-	})
-
 	for _, method := range methods {
 		testRemoteExecutableCapability(ctx, t, capability, 10, 9, 10*time.Millisecond, 10, 9, 10*time.Minute,
 			method)