Update icad manual e2e versions (cosmos#2162)

Author: chatton

.github/workflows/e2e-manual-icad.yaml

@@ -24,19 +24,19 @@ on:
         default: master
         options:
           - master
-          - v0.3.2
-          - v0.2.2
-          - v0.1.3
+          - v0.3.3
+          - v0.2.3
+          - v0.1.4
       chain-b-tag:
         default: master
         description: 'The tag to use for chain B'
         required: true
         type: choice
         options:
           - master
-          - v0.3.2
-          - v0.2.2
-          - v0.1.3
+          - v0.3.3
+          - v0.2.3
+          - v0.1.4
       relayer-tag:
         description: 'The tag to use for the relayer'
         required: true

e2e/scripts/test-matricies/main/test-matrix.json

@@ -48,20 +48,20 @@
     "chain-binary": "icad",
     "tests": [
       {
-        "chain-a-tag": "v0.3.2",
-        "chain-b-tag": "v0.1.3"
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.1.4"
       },
       {
-        "chain-a-tag": "v0.1.3",
-        "chain-b-tag": "v0.3.2"
+        "chain-a-tag": "v0.1.4",
+        "chain-b-tag": "v0.3.3"
       },
       {
-        "chain-a-tag": "v0.2.2",
-        "chain-b-tag": "v0.3.2"
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.3.3"
       },
       {
-        "chain-a-tag": "v0.3.2",
-        "chain-b-tag": "v0.2.2"
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.2.3"
       }
     ]
   },
@@ -70,12 +70,12 @@
     "chain-binary": "icad",
     "tests": [
       {
-        "chain-a-tag": "v0.2.2",
-        "chain-b-tag": "v0.3.2"
+        "chain-a-tag": "v0.2.3",
+        "chain-b-tag": "v0.3.3"
       },
       {
-        "chain-a-tag": "v0.3.2",
-        "chain-b-tag": "v0.2.2"
+        "chain-a-tag": "v0.3.3",
+        "chain-b-tag": "v0.2.3"
       }
     ]
   }

e2e/testsuite/testsuite.go

@@ -392,28 +392,13 @@ func (s *E2ETestSuite) createCosmosChains(chainOptions testconfig.ChainOptions)
 
 	logger := zaptest.NewLogger(s.T())
 
-	numValidators, numFullNodes := getValidatorsAndFullNodes(chainOptions)
+	numValidators, numFullNodes := 4, 1
 
 	chainA := cosmos.NewCosmosChain(s.T().Name(), *chainOptions.ChainAConfig, numValidators, numFullNodes, logger)
 	chainB := cosmos.NewCosmosChain(s.T().Name(), *chainOptions.ChainBConfig, numValidators, numFullNodes, logger)
 	return chainA, chainB
 }
 
-// getValidatorsAndFullNodes returns the number of validators and full nodes which should be used
-// for the given chain config.
-func getValidatorsAndFullNodes(chainOptions testconfig.ChainOptions) (int, int) {
-	// TODO: the icad tests are failing with a larger number of validators.
-	// this function can be removed once https://github.com/cosmos/ibc-go/issues/2104 is resolved.
-	numValidators := 4
-	numFullNodes := 1
-	isIcadImage := strings.Contains(chainOptions.ChainAConfig.Images[0].Repository, "icad")
-	if isIcadImage {
-		numValidators = 1
-		numFullNodes = 0
-	}
-	return numValidators, numFullNodes
-}
-
 // GetRelayerExecReporter returns a testreporter.RelayerExecReporter instances
 // using the current test's testing.T.
 func (s *E2ETestSuite) GetRelayerExecReporter() *testreporter.RelayerExecReporter {