Review comments

smartcontractkit · Jun 25, 2024 · 3bb59ee · 3bb59ee
1 parent ce190ba
commit 3bb59ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/integration-tests/ccip-tests/contracts/contract_deployer.go b/integration-tests/ccip-tests/contracts/contract_deployer.go
@@ -61,7 +61,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
-func HaveRequiredContractVersions(requiredContractVersions map[Name]Version) error {
+// MatchContractVersionsOrAbove checks if the current contract versions for the test match or exceed the provided contract versions
+func MatchContractVersionsOrAbove(requiredContractVersions map[Name]Version) error {
 	for contractName, r := range requiredContractVersions {
 		required := r
 		if contractVersion, ok := VersionMap[contractName]; !ok {
@@ -76,7 +77,7 @@ func HaveRequiredContractVersions(requiredContractVersions map[Name]Version) err
 // NeedTokenAdminRegistry checks if token admin registry is needed for the current version of ccip
 // if the version is less than 1.5.0-dev, then token admin registry is not needed
 func NeedTokenAdminRegistry() bool {
-	return HaveRequiredContractVersions(map[Name]Version{
+	return MatchContractVersionsOrAbove(map[Name]Version{
 		TokenPoolContract: V1_5_0_dev,
 	}) == nil
 }

diff --git a/integration-tests/ccip-tests/smoke/ccip_test.go b/integration-tests/ccip-tests/smoke/ccip_test.go
@@ -408,7 +408,7 @@ func TestSmokeCCIPSelfServeRateLimitOnRamp(t *testing.T) {
 
 	log := logging.GetTestLogger(t)
 	TestCfg := testsetups.NewCCIPTestConfig(t, log, testconfig.Smoke)
-	err := contracts.HaveRequiredContractVersions(map[contracts.Name]contracts.Version{
+	err := contracts.MatchContractVersionsOrAbove(map[contracts.Name]contracts.Version{
 		contracts.OffRampContract: contracts.V1_5_0_dev,
 		contracts.OnRampContract:  contracts.V1_5_0_dev,
 	})
@@ -534,7 +534,7 @@ func TestSmokeCCIPSelfServeRateLimitOffRamp(t *testing.T) {
 
 	log := logging.GetTestLogger(t)
 	TestCfg := testsetups.NewCCIPTestConfig(t, log, testconfig.Smoke)
-	err := contracts.HaveRequiredContractVersions(map[contracts.Name]contracts.Version{
+	err := contracts.MatchContractVersionsOrAbove(map[contracts.Name]contracts.Version{
 		contracts.OffRampContract: contracts.V1_5_0_dev,
 	})
 	require.NoError(t, err, "Required contract versions not met")