revert that one

Author: gjermundgaraba

.github/workflows/e2e-compatibility-workflow-call.yaml

@@ -41,9 +41,9 @@ jobs:
   e2e:
     runs-on: depot-ubuntu-24.04-4
     needs: load-test-matrix
-    # Annotations can generate {"include": []}; skip before Actions evaluates the empty matrix.
-    # See https://github.com/dorny/paths-filter/issues/66.
-    if: ${{ needs.load-test-matrix.outputs.test-matrix && fromJSON(needs.load-test-matrix.outputs.test-matrix).include[0] != null }}
+    # this job is skipped if the test-matrix generated is empty. i.e. if the file was not present.
+    # this allows us to not have to handle special case versions which may not have certain tests run against them.
+    if: needs.load-test-matrix.outputs.test-matrix
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.load-test-matrix.outputs.test-matrix) }}

e2e/tests/upgrades/v10_legacy_pfm_upgrade_test.go

@@ -115,18 +115,7 @@ func (s *V10LegacyPFMUpgradeTestSuite) UpgradeChain(ctx context.Context, chain *
 
 func withLegacyV10PFMOnChainB() testsuite.ChainOptionConfiguration {
 	return func(options *testsuite.ChainOptions) {
-		tc := testsuite.LoadConfig()
-		chainBSpec := options.ChainSpecs[1]
-		chainBConfig := tc.ChainConfigs[1]
-		chainBConfig.Tag = legacyV10PFMImageTag
-
-		chainBSpec.ChainConfig = testsuite.NewChainConfig(
-			chainBConfig,
-			chainBSpec.ChainConfig.Name,
-			chainBSpec.ChainConfig.ChainID,
-			chainBSpec.ChainConfig.Denom,
-			tc.CometBFTConfig,
-		)
+		options.ChainSpecs[1].ChainConfig.Images[0].Version = legacyV10PFMImageTag
 	}
 }
 

e2e/testsuite/testconfig.go

@@ -745,11 +745,6 @@ func DefaultChainOptions(chainCount int) (ChainOptions, error) {
 	}, nil
 }
 
-// NewChainConfig creates an ibc chain configuration from the provided e2e chain config.
-func NewChainConfig(cc ChainConfig, name, chainID, denom string, cometCfg CometBFTConfig) ibc.ChainConfig {
-	return newDefaultSimappConfig(cc, name, chainID, denom, cometCfg)
-}
-
 // newDefaultSimappConfig creates an ibc configuration for simd.
 func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string, cometCfg CometBFTConfig) ibc.ChainConfig {
 	configFileOverrides := make(map[string]any)