improve interest calculation for defaulted loans

Author: keithsue

x/lending/keeper/liquidation.go

@@ -32,7 +32,7 @@ func (k Keeper) HandleLiquidation(ctx sdk.Context, loan *types.Loan) {
 
 	// check if the loan has defaulted
 	if ctx.BlockTime().Unix() >= loan.MaturityTime {
-		liquidationInterest = loan.Interest
+		liquidationInterest = k.GetCurrentInterest(ctx, loan).Amount
 		loan.Status = types.LoanStatus_Defaulted
 
 		liquidationCet = dlcMeta.DefaultLiquidationCet.Tx

x/lending/keeper/loan.go

@@ -386,10 +386,7 @@ func (k Keeper) GetCurrentInterest(ctx sdk.Context, loan *types.Loan) sdk.Coin {
 		repayment := k.GetRepayment(ctx, loan.VaultAddress)
 		interest = repayment.Amount.Sub(loan.BorrowAmount).Amount
 
-	case types.LoanStatus_Defaulted:
-		interest = loan.Interest
-
-	case types.LoanStatus_Liquidated:
+	case types.LoanStatus_Defaulted, types.LoanStatus_Liquidated:
 		liquidation := k.liquidationKeeper.GetLiquidation(ctx, loan.LiquidationId)
 		interest = liquidation.DebtAmount.Amount.Sub(loan.BorrowAmount.Amount)