Fix issue with consumer v2.x compatibility e2e tests

app/consumer/genesis.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -218,7 +219,7 @@ func transformToV2(jsonRaw []byte, ctx client.Context) (json.RawMessage, error)
 	}
 
 	// patch .provider_client_state from provider.client_state if needed
-	if srcConGen.Provider.ConsensusState != nil {
+	if srcConGen.Provider.ClientState != nil {
 		clientState, exists := providerMap["client_state"]
 		if !exists {
 			return nil, fmt.Errorf("'client_state' not found in provider data")
@@ -237,6 +238,11 @@ func transformToV2(jsonRaw []byte, ctx client.Context) (json.RawMessage, error)
 	if err != nil {
 		return nil, fmt.Errorf("marshalling transformation result failed: %v", err)
 	}
+
+	// remove all `prehash_key_before_comparison` entries not supported in v2.x (see ics23)
+	re := regexp.MustCompile(`,\s*"prehash_key_before_comparison"\s*:\s*(false|true)`)
+	result = re.ReplaceAll(result, []byte{})
+
 	return result, nil
 }
 
@@ -247,7 +253,8 @@ func transformGenesis(ctx client.Context, targetVersion IcsVersion, jsonRaw []by
 	var err error = nil
 
 	switch targetVersion {
-	case v2_x, v3_0_x, v3_1_x:
+	// v2.x, v3.0-v3.2 share same consumer genesis type
+	case v2_x, v3_0_x, v3_1_x, v3_2_x:
 		newConsumerGenesis, err = transformToV2(jsonRaw, ctx)
 	case v3_3_x:
 		newConsumerGenesis, err = transformToV33(jsonRaw, ctx)