fix: fix lint errors

see initia-labs/miniwasm#53
milkyway-labs · Oct 7, 2024 · 10a2319 · 10a2319
1 parent 27a9f6c
commit 10a2319
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1367,7 +1367,9 @@ func (app *MilkyWayApp) InitChainer(ctx sdk.Context, req *abci.RequestInitChain)
 	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
-	_ = app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap())
+	if err := app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()); err != nil {
+		panic(err)
+	}
 	return app.ModuleManager.InitGenesis(ctx, app.appCodec, genesisState)
 }
 

diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go
@@ -199,12 +199,6 @@ func NewSetBeforeSendHookCmd(ac address.Codec) *cobra.Command {
 				return err
 			}
 
-			txf, err := tx.NewFactoryCLI(clientCtx, cmd.Flags())
-			if err != nil {
-				return err
-			}
-			txf = txf.WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever)
-
 			msg := types.NewMsgSetBeforeSendHook(
 				fromAddr,
 				args[0],

diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go
@@ -24,18 +24,15 @@ func (k Keeper) setBeforeSendHook(ctx context.Context, denom string, cosmwasmAdd
 
 	// delete the store for denom prefix store when cosmwasm address is nil
 	if cosmwasmAddress == "" {
-		k.DenomHookAddr.Remove(ctx, denom)
-		return nil
+		return k.DenomHookAddr.Remove(ctx, denom)
 	}
 
 	_, err = k.ac.StringToBytes(cosmwasmAddress)
 	if err != nil {
 		return err
 	}
 
-	k.DenomHookAddr.Set(ctx, denom, cosmwasmAddress)
-
-	return nil
+	return k.DenomHookAddr.Set(ctx, denom, cosmwasmAddress)
 }
 
 func (k Keeper) GetBeforeSendHook(ctx context.Context, denom string) string {

diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go
@@ -53,8 +53,7 @@ func (k Keeper) createDenomAfterValidation(ctx context.Context, creatorAddr stri
 		return err
 	}
 
-	k.addDenomFromCreator(ctx, creatorAddr, denom)
-	return nil
+	return k.addDenomFromCreator(ctx, creatorAddr, denom)
 }
 
 func (k Keeper) validateCreateDenom(ctx context.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) {

diff --git a/x/tokenfactory/keeper/creators.go b/x/tokenfactory/keeper/creators.go
@@ -12,9 +12,12 @@ func (k Keeper) addDenomFromCreator(ctx context.Context, creator, denom string)
 
 func (k Keeper) getDenomsFromCreator(ctx context.Context, creator string) []string {
 	denoms := []string{}
-	k.CreatorDenoms.Walk(ctx, collections.NewPrefixedPairRange[string, string](creator), func(key collections.Pair[string, string]) (stop bool, err error) {
+	err := k.CreatorDenoms.Walk(ctx, collections.NewPrefixedPairRange[string, string](creator), func(key collections.Pair[string, string]) (stop bool, err error) {
 		denoms = append(denoms, key.K2())
 		return false, nil
 	})
+	if err != nil {
+		panic(err)
+	}
 	return denoms
 }
diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go
@@ -39,7 +39,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) {
 // ExportGenesis returns the tokenfactory module's exported genesis.
 func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	genDenoms := []types.GenesisDenom{}
-	k.CreatorDenoms.Walk(ctx, nil, func(key collections.Pair[string, string]) (stop bool, err error) {
+	err := k.CreatorDenoms.Walk(ctx, nil, func(key collections.Pair[string, string]) (stop bool, err error) {
 		denom := key.K2()
 
 		authorityMetadata, err := k.GetAuthorityMetadata(ctx, denom)
@@ -53,6 +53,9 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 		})
 		return false, nil
 	})
+	if err != nil {
+		panic(err)
+	}
 
 	return &types.GenesisState{
 		FactoryDenoms: genDenoms,