adam comments

x/metoken/keeper/interest.go

@@ -17,13 +17,19 @@ func (k Keeper) ClaimInterest() error {
 	}
 
 	if k.ctx.BlockTime().After(interestClaimTime) {
-		leverageLiquidity, err := k.leverageKeeper.GetAllSupplied(*k.ctx,
-			authtypes.NewModuleAddress(metoken.ModuleName))
+		indexes := k.GetAllRegisteredIndexes()
+		if len(indexes) == 0 {
+			return nil
+		}
+
+		leverageLiquidity, err := k.leverageKeeper.GetAllSupplied(
+			*k.ctx,
+			authtypes.NewModuleAddress(metoken.ModuleName),
+		)
 		if err != nil {
 			return err
 		}
 
-		indexes := k.GetAllRegisteredIndexes()
 		for _, index := range indexes {
 			balances, err := k.IndexBalances(index.Denom)
 			if err != nil {

x/metoken/keeper/redeem.go

@@ -165,22 +165,11 @@ func (k Keeper) withdrawFromLeverage(tokensToWithdraw sdk.Coin) (sdk.Coin, error
 		return coin.Zero(tokensToWithdraw.Denom), nil
 	}
 
-	uTokensToWithdraw := sdk.NewCoin(
-		uTokensFromLeverage.Denom,
-		sdk.MinInt(
-			availableUTokensFromLeverage,
-			uTokensFromLeverage.Amount,
-		),
-	)
-	if _, _, err = k.leverageKeeper.Withdraw(
+	tokensWithdrawn, _, err := k.leverageKeeper.Withdraw(
 		*k.ctx,
 		authtypes.NewModuleAddress(metoken.ModuleName),
-		uTokensToWithdraw,
-	); err != nil {
-		return sdk.Coin{}, err
-	}
-
-	tokensWithdrawn, err := k.leverageKeeper.ExchangeUToken(*k.ctx, uTokensToWithdraw)
+		sdk.NewCoin(uTokensFromLeverage.Denom, sdk.MinInt(availableUTokensFromLeverage, uTokensFromLeverage.Amount)),
+	)
 	if err != nil {
 		return sdk.Coin{}, err
 	}