made changes as per comments

palomachain · Dec 11, 2023 · 3929f28 · 3929f28
1 parent 640f859
commit 3929f28
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/app.go b/app/app.go
@@ -813,8 +813,8 @@ func New(
 		evmmoduletypes.ModuleName,
 		wasmtypes.ModuleName,
 		// evmmoduletypes.ModuleName,
-		// // gravitymoduletypes.ModuleName,
-		// // treasurymoduletypes.ModuleName,
+		//  gravitymoduletypes.ModuleName,
+		// treasurymoduletypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		ibcexported.ModuleName,
 		icatypes.ModuleName,
@@ -847,7 +847,7 @@ func New(
 		evmmoduletypes.ModuleName,
 		wasmtypes.ModuleName,
 		// evmmoduletypes.ModuleName,
-		// // gravitymoduletypes.ModuleName,
+		// gravitymoduletypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		ibcexported.ModuleName,
 		icatypes.ModuleName,

diff --git a/app/app_setup.go b/app/app_setup.go
@@ -57,7 +57,6 @@ var DefaultConsensusParams = &tmproto.ConsensusParams{
 
 func NewTestApp(t testing, isCheckTx bool) TestApp {
 	db := dbm.NewMemDB()
-	encCfg := MakeEncodingConfig()
 
 	oldVersion := version.Version
 	version.Version = "v5.1.6"

diff --git a/cmd/palomad/root.go b/cmd/palomad/root.go
@@ -26,7 +26,6 @@ func NewRootCmd() *cobra.Command {
 	tempApp := palomaapp.New(cosmoslog.NewNopLogger(), dbm.NewMemDB(), nil, true, simtestutil.NewAppOptionsWithFlagHome(os.TempDir()))
 	encCfg := palomaapp.MakeEncodingConfig()
 
-	tempApp := palomaapp.New(cosmoslog.NewNopLogger(), db.NewMemDB(), io.MultiWriter(), true, encCfg, db.OptionsMap{})
 	initClientCtx := client.Context{}.
 		WithCodec(encCfg.Codec).
 		WithInterfaceRegistry(encCfg.InterfaceRegistry).

diff --git a/x/valset/keeper/keeper.go b/x/valset/keeper/keeper.go
@@ -64,7 +64,7 @@ func NewKeeper(
 		minimumPigeonVersion: minimumPigeonVersion,
 		powerReduction:       powerReduction,
 	}
-	k.ider = keeperutil.NewIDGenerator(keeperutil.StoreGetterFn(func(ctx sdk.Context) storetypes.KVStore {
+	k.ider = keeperutil.NewIDGenerator(keeperutil.StoreGetterFn(func(ctx context.Context) storetypes.KVStore {
 		store := runtime.KVStoreAdapter(k.storeKey.OpenKVStore(ctx))
 		return prefix.NewStore(store, []byte("IDs"))
 	}), nil)
@@ -533,7 +533,7 @@ func (k Keeper) IsJailed(ctx context.Context, val sdk.ValAddress) bool {
 func (k Keeper) Jail(ctx context.Context, valAddr sdk.ValAddress, reason string) error {
 	val, err := k.staking.Validator(ctx, valAddr)
 	if err != nil {
-		panic(err)
+		return err
 	}
 	if val == nil {
 		return ErrValidatorWithAddrNotFound.Format(valAddr)

diff --git a/x/valset/module.go b/x/valset/module.go
@@ -21,7 +21,6 @@ import (
 )
 
 var (
-	_ module.AppModuleBasic      = AppModuleBasic{}
 	_ module.AppModuleBasic      = AppModuleBasic{}
 	_ module.HasServices         = AppModule{}
 	_ module.HasInvariants       = AppModule{}