chore: adding calls to util.Panic (#1764)

* adding calls to util.Panic * add missing file --------- Co-authored-by: Sai Kumar <17549398+gsk967@users.noreply.github.com>
umee-network · Jan 31, 2023 · 9ebde6a · 9ebde6a
1 parent 549ca9f
commit 9ebde6a
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 140 deletions.
diff --git a/util/error.go b/util/error.go
@@ -0,0 +1,8 @@
+package util
+
+// Panic panics on error
+func Panic(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
diff --git a/x/leverage/abci.go b/x/leverage/abci.go
@@ -4,17 +4,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/leverage/keeper"
 )
 
 // EndBlocker implements EndBlock for the x/leverage module.
 func EndBlocker(ctx sdk.Context, k keeper.Keeper) []abci.ValidatorUpdate {
-	if err := k.SweepBadDebts(ctx); err != nil {
-		panic(err)
-	}
-	if err := k.AccrueAllInterest(ctx); err != nil {
-		panic(err)
-	}
+	util.Panic(k.SweepBadDebts(ctx))
+	util.Panic(k.AccrueAllInterest(ctx))
 
 	return []abci.ValidatorUpdate{}
 }
diff --git a/x/leverage/keeper/genesis.go b/x/leverage/keeper/genesis.go
@@ -4,6 +4,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/leverage/types"
 )
 
@@ -12,58 +13,35 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) {
 	k.SetParams(ctx, genState.Params)
 
 	for _, token := range genState.Registry {
-		if err := k.SetTokenSettings(ctx, token); err != nil {
-			panic(err)
-		}
+		util.Panic(k.SetTokenSettings(ctx, token))
 	}
 
 	for _, borrow := range genState.AdjustedBorrows {
 		borrower, err := sdk.AccAddressFromBech32(borrow.Address)
-		if err != nil {
-			panic(err)
-		}
-
-		if err = k.setAdjustedBorrow(ctx, borrower, borrow.Amount); err != nil {
-			panic(err)
-		}
+		util.Panic(err)
+		util.Panic(k.setAdjustedBorrow(ctx, borrower, borrow.Amount))
 	}
 
 	for _, collateral := range genState.Collateral {
 		borrower, err := sdk.AccAddressFromBech32(collateral.Address)
-		if err != nil {
-			panic(err)
-		}
-
-		if err = k.setCollateral(ctx, borrower, collateral.Amount); err != nil {
-			panic(err)
-		}
+		util.Panic(err)
+		util.Panic(k.setCollateral(ctx, borrower, collateral.Amount))
 	}
 
 	for _, reserve := range genState.Reserves {
-		if err := k.setReserves(ctx, reserve); err != nil {
-			panic(err)
-		}
+		util.Panic(k.setReserves(ctx, reserve))
 	}
 
-	if err := k.setLastInterestTime(ctx, genState.LastInterestTime); err != nil {
-		panic(err)
-	}
+	util.Panic(k.setLastInterestTime(ctx, genState.LastInterestTime))
 
 	for _, badDebt := range genState.BadDebts {
 		borrower, err := sdk.AccAddressFromBech32(badDebt.Address)
-		if err != nil {
-			panic(err)
-		}
-
-		if err := k.setBadDebtAddress(ctx, borrower, badDebt.Denom, true); err != nil {
-			panic(err)
-		}
+		util.Panic(err)
+		util.Panic(k.setBadDebtAddress(ctx, borrower, badDebt.Denom, true))
 	}
 
 	for _, rate := range genState.InterestScalars {
-		if err := k.setInterestScalar(ctx, rate.Denom, rate.Scalar); err != nil {
-			panic(err)
-		}
+		util.Panic(k.setInterestScalar(ctx, rate.Denom, rate.Scalar))
 	}
 }
 
@@ -102,10 +80,7 @@ func (k Keeper) getAllAdjustedBorrows(ctx sdk.Context) []types.AdjustedBorrow {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return borrows
 }
@@ -130,10 +105,7 @@ func (k Keeper) getAllCollateral(ctx sdk.Context) []types.Collateral {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return collateral
 }
@@ -157,10 +129,7 @@ func (k Keeper) getAllInterestScalars(ctx sdk.Context) []types.InterestScalar {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return interestScalars
 }
diff --git a/x/leverage/keeper/iter.go b/x/leverage/keeper/iter.go
@@ -4,6 +4,7 @@ import (
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/leverage/types"
 )
 
@@ -40,10 +41,7 @@ func (k Keeper) getAllBadDebts(ctx sdk.Context) []types.BadDebt {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return badDebts
 }
@@ -64,10 +62,7 @@ func (k Keeper) GetAllRegisteredTokens(ctx sdk.Context) []types.Token {
 		return nil
 	}
 
-	err := k.iterate(ctx, types.KeyPrefixRegisteredToken, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, types.KeyPrefixRegisteredToken, iterator))
 
 	return tokens
 }
@@ -90,10 +85,7 @@ func (k Keeper) GetAllReserves(ctx sdk.Context) sdk.Coins {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return reserves
 }
@@ -123,10 +115,7 @@ func (k Keeper) GetBorrowerBorrows(ctx sdk.Context, borrowerAddr sdk.AccAddress)
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return totalBorrowed
 }
@@ -151,10 +140,7 @@ func (k Keeper) GetBorrowerCollateral(ctx sdk.Context, borrowerAddr sdk.AccAddre
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return totalCollateral
 }
@@ -262,10 +248,7 @@ func (k Keeper) GetAllUTokenSupply(ctx sdk.Context) sdk.Coins {
 		return nil
 	}
 
-	err := k.iterate(ctx, prefix, iterator)
-	if err != nil {
-		panic(err)
-	}
+	util.Panic(k.iterate(ctx, prefix, iterator))
 
 	return supplies
 }
diff --git a/x/leverage/keeper/store.go b/x/leverage/keeper/store.go
@@ -5,6 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	gogotypes "github.com/gogo/protobuf/types"
 
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/leverage/types"
 )
 
@@ -14,9 +15,7 @@ import (
 func (k Keeper) getStoredDec(ctx sdk.Context, key []byte, minimum sdk.Dec, desc string) sdk.Dec {
 	if bz := ctx.KVStore(k.storeKey).Get(key); bz != nil {
 		val := sdk.ZeroDec()
-		if err := val.Unmarshal(bz); err != nil {
-			panic(err)
-		}
+		util.Panic(val.Unmarshal(bz))
 		if val.LTE(minimum) {
 			panic(types.ErrGetAmount.Wrapf("%s is not above the minimum %s of %s", val, desc, minimum))
 		}
@@ -52,9 +51,7 @@ func (k Keeper) setStoredDec(ctx sdk.Context, key []byte, val, minimum sdk.Dec,
 func (k Keeper) getStoredInt(ctx sdk.Context, key []byte, desc string) sdkmath.Int {
 	if bz := ctx.KVStore(k.storeKey).Get(key); bz != nil {
 		val := sdk.ZeroInt()
-		if err := val.Unmarshal(bz); err != nil {
-			panic(err)
-		}
+		util.Panic(val.Unmarshal(bz))
 		if val.LTE(sdk.ZeroInt()) {
 			panic(types.ErrGetAmount.Wrapf("%s is not above the minimum %s of zero", val, desc))
 		}
@@ -176,9 +173,7 @@ func (k Keeper) getLastInterestTime(ctx sdk.Context) int64 {
 	}
 
 	val := gogotypes.Int64Value{}
-	if err := k.cdc.Unmarshal(bz, &val); err != nil {
-		panic(err)
-	}
+	k.cdc.MustUnmarshal(bz, &val)
 	if val.Value < 0 {
 		panic(types.ErrGetAmount.Wrapf("%d is below the minimum LastInterestTime of zero", val.Value))
 	}

diff --git a/x/oracle/genesis.go b/x/oracle/genesis.go
@@ -5,6 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/oracle/keeper"
 	"github.com/umee-network/umee/v4/x/oracle/types"
 )
@@ -14,14 +15,9 @@ import (
 func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, genState types.GenesisState) {
 	for _, d := range genState.FeederDelegations {
 		voter, err := sdk.ValAddressFromBech32(d.ValidatorAddress)
-		if err != nil {
-			panic(err)
-		}
-
+		util.Panic(err)
 		feeder, err := sdk.AccAddressFromBech32(d.FeederAddress)
-		if err != nil {
-			panic(err)
-		}
+		util.Panic(err)
 
 		keeper.SetFeederDelegation(ctx, voter, feeder)
 	}
@@ -32,27 +28,21 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, genState types.GenesisSt
 
 	for _, mc := range genState.MissCounters {
 		operator, err := sdk.ValAddressFromBech32(mc.ValidatorAddress)
-		if err != nil {
-			panic(err)
-		}
+		util.Panic(err)
 
 		keeper.SetMissCounter(ctx, operator, mc.MissCounter)
 	}
 
 	for _, ap := range genState.AggregateExchangeRatePrevotes {
 		valAddr, err := sdk.ValAddressFromBech32(ap.Voter)
-		if err != nil {
-			panic(err)
-		}
+		util.Panic(err)
 
 		keeper.SetAggregateExchangeRatePrevote(ctx, valAddr, ap)
 	}
 
 	for _, av := range genState.AggregateExchangeRateVotes {
 		valAddr, err := sdk.ValAddressFromBech32(av.Voter)
-		if err != nil {
-			panic(err)
-		}
+		util.Panic(err)
 
 		keeper.SetAggregateExchangeRateVote(ctx, valAddr, av)
 	}

diff --git a/x/oracle/keeper/slash.go b/x/oracle/keeper/slash.go
@@ -11,19 +11,15 @@ import (
 // If the valid vote rate is below the minValidPerWindow, the validator will be
 // slashed and jailed.
 func (k Keeper) SlashAndResetMissCounters(ctx sdk.Context) {
-	height := ctx.BlockHeight()
-	distributionHeight := height - sdk.ValidatorUpdateDelay - 1
-
 	var (
+		height               = ctx.BlockHeight()
+		distributionHeight   = height - sdk.ValidatorUpdateDelay - 1
 		slashWindow          = int64(k.SlashWindow(ctx))
 		votePeriod           = int64(k.VotePeriod(ctx))
 		votePeriodsPerWindow = sdk.NewDec(slashWindow).QuoInt64(votePeriod).TruncateInt64()
-	)
-
-	var (
-		minValidPerWindow = k.MinValidPerWindow(ctx)
-		slashFraction     = k.SlashFraction(ctx)
-		powerReduction    = k.StakingKeeper.PowerReduction(ctx)
+		minValidPerWindow    = k.MinValidPerWindow(ctx)
+		slashFraction        = k.SlashFraction(ctx)
+		powerReduction       = k.StakingKeeper.PowerReduction(ctx)
 	)
 
 	k.IterateMissCounters(ctx, func(operator sdk.ValAddress, missCounter uint64) bool {

diff --git a/x/oracle/module.go b/x/oracle/module.go
@@ -18,6 +18,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+	"github.com/umee-network/umee/v4/util"
 	"github.com/umee-network/umee/v4/x/oracle/client/cli"
 	"github.com/umee-network/umee/v4/x/oracle/keeper"
 	simulation "github.com/umee-network/umee/v4/x/oracle/simulations"
@@ -83,9 +84,8 @@ func (AppModuleBasic) RegisterRESTRoutes(client.Context, *mux.Router) {}
 // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the x/oracle
 // module.
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
-	if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil {
-		panic(err)
-	}
+	err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx))
+	util.Panic(err)
 }
 
 // GetTxCmd returns the x/oracle module's root tx command.
@@ -180,9 +180,8 @@ func (am AppModule) BeginBlock(sdk.Context, abci.RequestBeginBlock) {}
 // EndBlock executes all ABCI EndBlock logic respective to the x/oracle module.
 // It returns no validator updates.
 func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
-	if err := EndBlocker(ctx, am.keeper); err != nil {
-		panic(err)
-	}
+	err := EndBlocker(ctx, am.keeper)
+	util.Panic(err)
 
 	return []abci.ValidatorUpdate{}
 }