Fixing semver version check in e2e (cosmos#2307)

ulbqb · Sep 20, 2022 · b97729d · b97729d
1 parent 036c09e
commit b97729d
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 2 deletions.
diff --git a/e2e/scripts/test-matricies/icad/test-matrix.json b/e2e/scripts/test-matricies/icad/test-matrix.json
@@ -0,0 +1,58 @@
+[
+  {
+    "test-entry-point": "TestInterchainAccountsTestSuite",
+    "chain-binary": "icad",
+    "tests": [
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.1.4"
+      },
+      {
+        "chain-a-tag": "v0.1.4",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.1.4",
+        "chain-b-tag": "v0.1.4"
+      }
+    ]
+  },
+  {
+    "test-entry-point": "TestIncentivizedInterchainAccountsTestSuite",
+    "chain-binary": "icad",
+    "tests": [
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.2.3"
+      }
+    ]
+  }
+]
diff --git a/e2e/scripts/test-matricies/main/test-matrix.json b/e2e/scripts/test-matricies/main/test-matrix.json
@@ -62,6 +62,18 @@
       {
         "chain-a-tag": "v0.3.3",
         "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.1.4",
+        "chain-b-tag": "v0.1.4"
       }
     ]
   },
@@ -76,6 +88,14 @@
       {
         "chain-a-tag": "v0.3.3",
         "chain-b-tag": "v0.2.3"
+      },
+      {
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.3.3"
+      },
+      {
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.2.3"
       }
     ]
   }

diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go
@@ -50,8 +50,8 @@ func (s *InterchainAccountsTestSuite) RegisterCounterPartyPayee(ctx context.Cont
 // getICAVersion returns the version which should be used in the MsgRegisterAccount broadcast from the
 // controller chain.
 func getICAVersion(chainAVersion, chainBVersion string) string {
-	chainBIsGreaterThanChainA := semver.Compare(chainAVersion, chainBVersion) == -1
-	if chainBIsGreaterThanChainA {
+	chainBIsGreaterThanOrEqualToChainA := semver.Compare(chainAVersion, chainBVersion) <= 0
+	if chainBIsGreaterThanOrEqualToChainA {
 		// allow version to be specified by the controller chain
 		return ""
 	}