From c236aca8bddeacac737a2066dfbdc70dc266a4e5 Mon Sep 17 00:00:00 2001 From: dimitris Date: Tue, 19 Nov 2024 12:13:20 +0200 Subject: [PATCH] add batched msg to test exec plugin and filter out non signers (#15220) --- integration-tests/smoke/ccip_rmn_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/integration-tests/smoke/ccip_rmn_test.go b/integration-tests/smoke/ccip_rmn_test.go index 7372e10550c..a37b601e9d9 100644 --- a/integration-tests/smoke/ccip_rmn_test.go +++ b/integration-tests/smoke/ccip_rmn_test.go @@ -29,9 +29,9 @@ import ( // Set false to run the RMN tests const skipRmnTest = true -func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { +func TestRMN_TwoMessagesOnTwoLanesIncludingBatching(t *testing.T) { runRmnTestCase(t, rmnTestCase{ - name: "messages on two lanes", + name: "messages on two lanes including batching", waitForExec: true, homeChainConfig: homeChainConfig{ f: map[int]int{chain0: 1, chain1: 1}, @@ -47,7 +47,7 @@ func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { }, messagesToSend: []messageToSend{ {fromChainIdx: chain0, toChainIdx: chain1, count: 1}, - {fromChainIdx: chain1, toChainIdx: chain0, count: 1}, + {fromChainIdx: chain1, toChainIdx: chain0, count: 5}, }, }) } @@ -205,8 +205,6 @@ func runRmnTestCase(t *testing.T, tc rmnTestCase) { for _, rmnNodeInfo := range tc.rmnNodes { rmn := rmnCluster.Nodes["rmn_"+strconv.Itoa(rmnNodeInfo.id)] - t.Log(rmnNodeInfo.id, rmn.Proxy.PeerID, rmn.RMN.OffchainPublicKey, rmn.RMN.EVMOnchainPublicKey) - var offchainPublicKey [32]byte copy(offchainPublicKey[:], rmn.RMN.OffchainPublicKey) @@ -215,10 +213,12 @@ func runRmnTestCase(t *testing.T, tc rmnTestCase) { OffchainPublicKey: offchainPublicKey, }) - rmnRemoteSigners = append(rmnRemoteSigners, rmn_remote.RMNRemoteSigner{ - OnchainPublicKey: rmn.RMN.EVMOnchainPublicKey, - NodeIndex: uint64(rmnNodeInfo.id), - }) + if rmnNodeInfo.isSigner { + rmnRemoteSigners = append(rmnRemoteSigners, rmn_remote.RMNRemoteSigner{ + OnchainPublicKey: rmn.RMN.EVMOnchainPublicKey, + NodeIndex: uint64(rmnNodeInfo.id), + }) + } } var rmnHomeSourceChains []rmn_home.RMNHomeSourceChain