revert total borrows handling on liquidation

Author: keithsue

x/lending/keeper/liquidation.go

@@ -118,7 +118,7 @@ func (k Keeper) HandleLiquidatedDebt(ctx sdk.Context, liquidationId uint64, loan
 		}
 	}
 
-	k.AfterPoolRepaid(ctx, loan.PoolId, loan.Maturity, debtAmount.SubAmount(interest), interest, protocolFee, actualProtocolFee, false)
+	k.AfterPoolRepaid(ctx, loan.PoolId, loan.Maturity, debtAmount.SubAmount(interest), interest, protocolFee, actualProtocolFee)
 
 	return nil
 }

x/lending/keeper/pool.go

@@ -98,20 +98,17 @@ func (k Keeper) AfterPoolBorrowed(ctx sdk.Context, poolId string, maturity int64
 }
 
 // AfterPoolRepaid is the hook which is invoked after the loan is repaid
-func (k Keeper) AfterPoolRepaid(ctx sdk.Context, poolId string, maturity int64, amount sdk.Coin, interest sdkmath.Int, protocolFee sdkmath.Int, actualProtocolFee sdkmath.Int, updateTotalBorrowed bool) {
+func (k Keeper) AfterPoolRepaid(ctx sdk.Context, poolId string, maturity int64, amount sdk.Coin, interest sdkmath.Int, protocolFee sdkmath.Int, actualProtocolFee sdkmath.Int) {
 	pool := k.GetPool(ctx, poolId)
 
 	totalRepaid := amount.Amount.Add(interest).Sub(protocolFee)
 
 	pool.Supply = pool.Supply.AddAmount(interest).SubAmount(protocolFee)
 	pool.AvailableAmount = pool.AvailableAmount.Add(totalRepaid)
 	pool.BorrowedAmount = pool.BorrowedAmount.Sub(amount.Amount)
+	pool.TotalBorrowed = pool.TotalBorrowed.Sub(totalRepaid)
 	pool.ReserveAmount = pool.ReserveAmount.Add(actualProtocolFee)
 
-	if updateTotalBorrowed {
-		pool.TotalBorrowed = pool.TotalBorrowed.Sub(totalRepaid)
-	}
-
 	for i, tranche := range pool.Tranches {
 		if tranche.Maturity == maturity {
 			pool.Tranches[i].TotalBorrowed = pool.Tranches[i].TotalBorrowed.Sub(totalRepaid)
@@ -124,24 +121,6 @@ func (k Keeper) AfterPoolRepaid(ctx sdk.Context, poolId string, maturity int64,
 	k.SetPool(ctx, pool)
 }
 
-// DecreaseTotalBorrowed decreases total borrowed by the given amount for the specified pool
-func (k Keeper) DecreaseTotalBorrowed(ctx sdk.Context, poolId string, maturity int64, amount sdkmath.Int) {
-	pool := k.GetPool(ctx, poolId)
-
-	pool.TotalBorrowed = pool.TotalBorrowed.Sub(amount)
-
-	for i, tranche := range pool.Tranches {
-		if tranche.Maturity == maturity {
-			pool.Tranches[i].TotalBorrowed = pool.Tranches[i].TotalBorrowed.Sub(amount)
-			break
-		}
-	}
-
-	k.NormalizePool(ctx, pool)
-
-	k.SetPool(ctx, pool)
-}
-
 // UpdatePoolTranches updates total borrowed amount for each tranche at the beginning of each block
 //
 // Formula:

x/lending/keeper/repayment.go

@@ -70,7 +70,7 @@ func (k Keeper) CompleteRepayment(ctx sdk.Context, loan *types.Loan) error {
 	}
 
 	// update pool
-	k.AfterPoolRepaid(ctx, loan.PoolId, loan.Maturity, loan.BorrowAmount, interest.Amount, protocolFee.Amount, actualProtocolFee.Amount, true)
+	k.AfterPoolRepaid(ctx, loan.PoolId, loan.Maturity, loan.BorrowAmount, interest.Amount, protocolFee.Amount, actualProtocolFee.Amount)
 
 	loan.Status = types.LoanStatus_Closed
 	k.SetLoan(ctx, loan)

x/lending/module/abci.go

@@ -120,9 +120,6 @@ func handleActiveLoans(ctx sdk.Context, k keeper.Keeper) {
 
 			// update loan
 			k.SetLoan(ctx, loan)
-
-			// update pool
-			k.DecreaseTotalBorrowed(ctx, loan.PoolId, loan.Maturity, liquidation.DebtAmount.Amount.Sub(types.GetProtocolFee(liquidationInterest, pool.Config.ReserveFactor)))
 		}
 	}
 }