fixes

Author: julienrbrt

CHANGELOG.md

@@ -45,11 +45,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-<<<<<<< HEAD
 * (x/bank) [#21460](https://github.com/cosmos/cosmos-sdk/pull/21460) Added `Sender` attribute in `MsgMultiSend` event.
-=======
 * (genutil) [#21701](https://github.com/cosmos/cosmos-sdk/pull/21701) Improved error messages for genesis validation.
->>>>>>> 9c5cea08c (feat(x/genutil): add better error messages for genesis validation (#21701))
 
 ### Bug Fixes
 

x/genutil/client/cli/validate_genesis.go

@@ -49,28 +49,19 @@ func ValidateGenesisCmd(mbm module.BasicManager) *cobra.Command {
 
 			var genState map[string]json.RawMessage
 			if err = json.Unmarshal(appGenesis.AppState, &genState); err != nil {
-<<<<<<< HEAD
-				return fmt.Errorf("error unmarshalling genesis doc %s: %s", genesis, err.Error())
-			}
-
-			if err = mbm.ValidateGenesis(cdc, clientCtx.TxConfig, genState); err != nil {
-				return fmt.Errorf("error validating genesis file %s: %s", genesis, err.Error())
-=======
 				if strings.Contains(err.Error(), "unexpected end of JSON input") {
 					return fmt.Errorf("app_state is missing in the genesis file: %s", err.Error())
 				}
-				return fmt.Errorf("error unmarshalling genesis doc %s: %w", genesis, err)
+
+				return fmt.Errorf("error unmarshalling genesis doc %s: %s", genesis, err.Error())
 			}
 
-			if genMM != nil {
-				if err = genMM.ValidateGenesis(genState); err != nil {
-					errStr := fmt.Sprintf("error validating genesis file %s: %s", genesis, err.Error())
-					if errors.Is(err, io.EOF) {
-						errStr = fmt.Sprintf("%s: section is missing in the app_state", errStr)
-					}
-					return fmt.Errorf("%s", errStr)
+			if err = mbm.ValidateGenesis(cdc, clientCtx.TxConfig, genState); err != nil {
+				errStr := fmt.Sprintf("error validating genesis file %s: %s", genesis, err.Error())
+				if errors.Is(err, io.EOF) {
+					errStr = fmt.Sprintf("%s: section is missing in the app_state", errStr)
 				}
->>>>>>> 9c5cea08c (feat(x/genutil): add better error messages for genesis validation (#21701))
+				return fmt.Errorf("%s", errStr)
 			}
 
 			fmt.Fprintf(cmd.OutOrStdout(), "File at %s is a valid genesis file\n", genesis)

x/genutil/client/cli/validate_genesis_test.go

@@ -6,17 +6,14 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	appmodulev2 "cosmossdk.io/core/appmodule/v2"
-	"cosmossdk.io/x/staking"
-
 	"github.com/cosmos/cosmos-sdk/client"
-	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	testutilmod "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
+	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
 // An example exported genesis file from a 0.37 chain. Note that evidence
@@ -39,18 +36,18 @@ var v037Exported = `{
 }`
 
 func TestValidateGenesis(t *testing.T) {
-	cdc := testutilmod.MakeTestEncodingConfig(codectestutil.CodecOptions{}, genutil.AppModule{}).Codec
+	cdc := testutilmod.MakeTestEncodingConfig(genutil.AppModule{}).Codec
 	testCases := []struct {
 		name      string
 		genesis   string
 		expErrStr string
-		genMM     *module.Manager
+		genMM     module.BasicManager
 	}{
 		{
 			"invalid json",
 			`{"app_state": {x,}}`,
 			"error at offset 16: invalid character",
-			module.NewManagerFromMap(nil),
+			module.NewBasicManager(),
 		},
 		{
 			"invalid: missing module config in app_state",
@@ -61,15 +58,13 @@ func TestValidateGenesis(t *testing.T) {
 				return string(bz)
 			}(),
 			"section is missing in the app_state",
-			module.NewManagerFromMap(map[string]appmodulev2.AppModule{
-				"custommod": staking.NewAppModule(cdc, nil, nil, nil),
-			}),
+			module.NewBasicManager(staking.NewAppModule(cdc, nil, nil, nil, nil)),
 		},
 		{
 			"exported 0.37 genesis file",
 			v037Exported,
 			"make sure that you have correctly migrated all CometBFT consensus params",
-			module.NewManagerFromMap(nil),
+			module.NewBasicManager(),
 		},
 		{
 			"valid 0.50 genesis file",
@@ -80,7 +75,7 @@ func TestValidateGenesis(t *testing.T) {
 				return string(bz)
 			}(),
 			"",
-			module.NewManagerFromMap(nil),
+			module.NewBasicManager(),
 		},
 	}