e2e: optimise running of params tests/set default allowed clients con…

…ditionally on version (#4428) * wip: fixing failing params test * fine tuned host enabled params test * Use slices.DeleteFunc, fix LocalhostClientFeatureReleases docstring. --------- Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
cosmos · Aug 24, 2023 · dd85040 · dd85040
1 parent 0ba21dc
commit dd85040
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 50 deletions.
diff --git a/.github/compatibility-test-matrices/main/client-chain-b.json b/.github/compatibility-test-matrices/main/client-chain-b.json
@@ -17,8 +17,7 @@
   ],
   "test": [
     "TestClientUpdateProposal_Succeeds",
-    "TestClient_Update_Misbehaviour",
-    "TestAllowedClientsParam"
+    "TestClient_Update_Misbehaviour"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/main/ica-chain-a.json b/.github/compatibility-test-matrices/main/ica-chain-a.json
@@ -15,8 +15,7 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
-    "TestHostEnabledParam"
+    "TestControllerEnabledParam"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/main/ica-chain-b.json b/.github/compatibility-test-matrices/main/ica-chain-b.json
@@ -15,7 +15,6 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
     "TestHostEnabledParam"
   ],
   "relayer-type": [

diff --git a/.github/compatibility-test-matrices/main/transfer-chain-b.json b/.github/compatibility-test-matrices/main/transfer-chain-b.json
@@ -19,9 +19,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.4.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.3.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json
@@ -16,8 +16,7 @@
   ],
   "test": [
     "TestClientUpdateProposal_Succeeds",
-    "TestClient_Update_Misbehaviour",
-    "TestAllowedClientsParam"
+    "TestClient_Update_Misbehaviour"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json
@@ -15,8 +15,7 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
-    "TestHostEnabledParam"
+    "TestControllerEnabledParam"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json
@@ -15,7 +15,6 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
     "TestHostEnabledParam"
   ],
   "relayer-type": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/client-chain-b.json
@@ -16,8 +16,7 @@
   ],
   "test": [
     "TestClientUpdateProposal_Succeeds",
-    "TestClient_Update_Misbehaviour",
-    "TestAllowedClientsParam"
+    "TestClient_Update_Misbehaviour"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-a.json
@@ -15,8 +15,7 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
-    "TestHostEnabledParam"
+    "TestControllerEnabledParam"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/ica-chain-b.json
@@ -15,7 +15,6 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
     "TestHostEnabledParam"
   ],
   "relayer-type": [

diff --git a/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.2.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/client-chain-b.json
@@ -16,8 +16,7 @@
   ],
   "test": [
     "TestClientUpdateProposal_Succeeds",
-    "TestClient_Update_Misbehaviour",
-    "TestAllowedClientsParam"
+    "TestClient_Update_Misbehaviour"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-a.json
@@ -15,8 +15,7 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
-    "TestHostEnabledParam"
+    "TestControllerEnabledParam"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/ica-chain-b.json
@@ -15,7 +15,6 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
     "TestHostEnabledParam"
   ],
   "relayer-type": [

diff --git a/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.2.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/client-chain-b.json
@@ -16,8 +16,7 @@
   ],
   "test": [
     "TestClientUpdateProposal_Succeeds",
-    "TestClient_Update_Misbehaviour",
-    "TestAllowedClientsParam"
+    "TestClient_Update_Misbehaviour"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-a.json
@@ -15,8 +15,7 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
-    "TestHostEnabledParam"
+    "TestControllerEnabledParam"
   ],
   "relayer-type": [
     "rly"

diff --git a/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/ica-chain-b.json
@@ -15,7 +15,6 @@
     "TestMsgSendTx_SuccessfulTransfer",
     "TestMsgSendTx_FailedTransfer_InsufficientFunds",
     "TestMsgSendTx_SuccessfulTransfer_AfterReopeningICA",
-    "TestControllerEnabledParam",
     "TestHostEnabledParam"
   ],
   "relayer-type": [

diff --git a/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.3.x/transfer-chain-b.json
@@ -18,9 +18,7 @@
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
     "TestMsgTransfer_Timeout_Nonincentivized",
-    "TestMsgTransfer_WithMemo",
-    "TestSendEnabledParam",
-    "TestReceiveEnabledParam"
+    "TestMsgTransfer_WithMemo"
   ],
   "relayer-type": [
     "rly"

diff --git a/e2e/tests/core/02-client/client_test.go b/e2e/tests/core/02-client/client_test.go
@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 	"testing"
@@ -269,7 +270,12 @@ func (s *ClientTestSuite) TestAllowedClientsParam() {
 
 	t.Run("ensure allowed clients are set to the default", func(t *testing.T) {
 		allowedClients := s.QueryAllowedClients(ctx, chainA)
-		s.Require().Equal(clienttypes.DefaultAllowedClients, allowedClients)
+
+		defaultAllowedClients := clienttypes.DefaultAllowedClients
+		if !testvalues.LocalhostClientFeatureReleases.IsSupported(chainAVersion) {
+			defaultAllowedClients = slices.DeleteFunc(defaultAllowedClients, func(s string) bool { return s == ibcexported.Localhost })
+		}
+		s.Require().Equal(defaultAllowedClients, allowedClients)
 	})
 
 	allowedClient := ibcexported.Solomachine

diff --git a/e2e/testvalues/values.go b/e2e/testvalues/values.go
@@ -101,3 +101,10 @@ var TotalEscrowFeatureReleases = semverutil.FeatureReleases{
 var IbcErrorsFeatureReleases = semverutil.FeatureReleases{
 	MajorVersion: "v8.0",
 }
+
+// LocalhostClientFeatureReleases represents the releases the localhost client was released in.
+var LocalhostClientFeatureReleases = semverutil.FeatureReleases{
+	MinorVersions: []string{
+		"v7.1",
+	},
+}