From 6fe155bb49197603d54798150ad845a480279f99 Mon Sep 17 00:00:00 2001 From: Anirudh Warrier <12178754+anirudhwarrier@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:53:18 +0400 Subject: [PATCH 1/2] replace contains with equals (#1385) ## Motivation When simulating slow load on testnet, the load gen was getting applied to multiple networks. ## Solution Replace contains check with EqualFold. Also add some logs to make it easier to understand. --- integration-tests/ccip-tests/load/helper.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/integration-tests/ccip-tests/load/helper.go b/integration-tests/ccip-tests/load/helper.go index 54d9fb2c11..dbb5ffc3e9 100644 --- a/integration-tests/ccip-tests/load/helper.go +++ b/integration-tests/ccip-tests/load/helper.go @@ -111,8 +111,15 @@ func (l *LoadArgs) scheduleForDest(destNetworkName string) []*wasp.Segment { // if found, use that frequency for the destination network // otherwise, use the default frequency if l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination != nil { + l.lggr.Debug(). + Interface("FrequencyByDestination", l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination). + Msg("LoadProfile provided") for networkName, freq := range l.TestCfg.TestGroupInput.LoadProfile.FrequencyByDestination { - if strings.Contains(destNetworkName, strings.ToLower(networkName)) { + l.lggr.Debug().Str("Destination", destNetworkName).Str("NetworkName", networkName).Msg("Checking frequency for destination") + if strings.EqualFold(destNetworkName, networkName) { + l.lggr.Info().Str("Destination", destNetworkName). + Ints64("RequestPerUnitTime", freq.RequestPerUnitTime). + Msg("Using frequency for destination") return WaspSchedule( freq.RequestPerUnitTime, l.TestCfg.TestGroupInput.LoadProfile.TestDuration, From 8572a7ad10dc024621d87d0b4555fa081c4d1da0 Mon Sep 17 00:00:00 2001 From: Anirudh Warrier <12178754+anirudhwarrier@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:02:13 +0400 Subject: [PATCH 2/2] bump anvil version used in load tests (#1386) ## Motivation During load tests, when anvil node restarts, block history is lost. Identified this to be a bug in the pinned version of anvil. ## Solution Bump anvil version to latest nightly. --- integration-tests/ccip-tests/testsetups/test_env.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/integration-tests/ccip-tests/testsetups/test_env.go b/integration-tests/ccip-tests/testsetups/test_env.go index 85a5a10511..1eb7ebd452 100644 --- a/integration-tests/ccip-tests/testsetups/test_env.go +++ b/integration-tests/ccip-tests/testsetups/test_env.go @@ -490,8 +490,7 @@ func DeployEnvironments( "fullnameOverride": actions.NetworkName(network.Name), "image": map[string]interface{}{ "repository": "ghcr.io/foundry-rs/foundry", - "tag": "nightly-5ac78a9cd4b94dc53d1fe5e0f42372b28b5a7559", - // "tag": "nightly-ea2eff95b5c17edd3ffbdfc6daab5ce5cc80afc0", + "tag": "nightly-2442e7a5fc165d7d0b022aa8b9f09dcdf675157b", }, "anvil": map[string]interface{}{ "chainId": fmt.Sprintf("%d", network.ChainID),