From b97729d4ee9cd0509fa45e0bab76f7e77030c6e2 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cian@interchain.io>
Date: Tue, 20 Sep 2022 14:00:57 +0100
Subject: [PATCH] Fixing semver version check in e2e (#2307)

---
 .../test-matricies/icad/test-matrix.json      | 58 +++++++++++++++++++
 .../test-matricies/main/test-matrix.json      | 20 +++++++
 e2e/tests/interchain_accounts/base_test.go    |  4 +-
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 e2e/scripts/test-matricies/icad/test-matrix.json

diff --git a/e2e/scripts/test-matricies/icad/test-matrix.json b/e2e/scripts/test-matricies/icad/test-matrix.json
new file mode 100644
index 00000000000..9df5b2524ba
--- /dev/null
+++ 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
index d8b40fd099c..78c7f445e57 100644
--- 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
index 5318b0b4bf5..4388d527c09 100644
--- 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 ""
 	}