Merge branch 'master' into fix/87

This commit is contained in:
emilio 2020-10-27 22:12:23 +01:00
commit a2d068a817

View File

@ -102,10 +102,10 @@ library GenericLogic {
.collateralBalanceETH .collateralBalanceETH
.mul(vars.avgLiquidationThreshold) .mul(vars.avgLiquidationThreshold)
.sub(vars.amountToDecreaseETH.mul(vars.liquidationThreshold)) .sub(vars.amountToDecreaseETH.mul(vars.liquidationThreshold))
.div(vars.collateralBalancefterDecrease); .div(vars.collateralBalanceAfterDecrease);
uint256 healthFactorAfterDecrease = calculateHealthFactorFromBalances( uint256 healthFactorAfterDecrease = calculateHealthFactorFromBalances(
vars.collateralBalancefterDecrease, vars.collateralBalanceAfterDecrease,
vars.borrowBalanceETH, vars.borrowBalanceETH,
vars.liquidationThresholdAfterDecrease vars.liquidationThresholdAfterDecrease
); );