mirror of
https://github.com/Instadapp/aave-protocol-v2.git
synced 2024-07-29 21:47:30 +00:00
fixed last tests on repayWithCollateral
This commit is contained in:
parent
b7c4a255a9
commit
8ed9b88163
|
@ -297,7 +297,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
|
||||||
'INVALID_DEBT_POSITION'
|
'INVALID_DEBT_POSITION'
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(wethUserDataAfter.currentATokenBalance).to.be.bignumber.equal(
|
expect(wethUserDataAfter.currentATokenBalance).to.be.bignumber.almostEqual(
|
||||||
new BigNumber(wethUserDataBefore.currentATokenBalance).minus(
|
new BigNumber(wethUserDataBefore.currentATokenBalance).minus(
|
||||||
expectedCollateralLiquidated.toString()
|
expectedCollateralLiquidated.toString()
|
||||||
),
|
),
|
||||||
|
@ -570,7 +570,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
|
||||||
);
|
);
|
||||||
|
|
||||||
// First half
|
// First half
|
||||||
const amountToRepay = daiReserveDataBefore.totalVariableDebt.multipliedBy(0.6).toString();
|
const amountToRepay = daiReserveDataBefore.totalVariableDebt.multipliedBy(0.6).toFixed(0).toString();
|
||||||
|
|
||||||
await mockSwapAdapter.setAmountToReturn(amountToRepay);
|
await mockSwapAdapter.setAmountToReturn(amountToRepay);
|
||||||
await waitForTx(
|
await waitForTx(
|
||||||
|
@ -818,7 +818,7 @@ makeSuite('LendingPool. repayWithCollateral() with liquidator', (testEnv: TestEn
|
||||||
new BigNumber(repayWithCollateralTimestamp)
|
new BigNumber(repayWithCollateralTimestamp)
|
||||||
).minus(usdcUserDataBefore.currentVariableDebt);
|
).minus(usdcUserDataBefore.currentVariableDebt);
|
||||||
|
|
||||||
expect(usdcUserDataAfter.currentVariableDebt).to.be.bignumber.equal(
|
expect(usdcUserDataAfter.currentVariableDebt).to.be.bignumber.almostEqual(
|
||||||
new BigNumber(usdcUserDataBefore.currentVariableDebt)
|
new BigNumber(usdcUserDataBefore.currentVariableDebt)
|
||||||
.minus(expectedDebtCovered.toString())
|
.minus(expectedDebtCovered.toString())
|
||||||
.plus(expectedVariableDebtIncrease),
|
.plus(expectedVariableDebtIncrease),
|
||||||
|
|
|
@ -663,15 +663,6 @@ export const rebalanceStableBorrowRate = async (
|
||||||
txTimestamp
|
txTimestamp
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log("total debt stable exp ", expectedReserveData.totalStableDebt.toFixed());
|
|
||||||
console.log("total debt stable act ", reserveDataAfter.totalStableDebt.toFixed());
|
|
||||||
|
|
||||||
console.log("total debt variable exp ", expectedReserveData.totalVariableDebt.toFixed());
|
|
||||||
console.log("total debt variable act ", reserveDataAfter.totalVariableDebt.toFixed());
|
|
||||||
|
|
||||||
console.log("avl liquidity exp ", expectedReserveData.availableLiquidity.toFixed());
|
|
||||||
console.log("avl liquidity exp ", reserveDataAfter.availableLiquidity.toFixed());
|
|
||||||
|
|
||||||
expectEqual(reserveDataAfter, expectedReserveData);
|
expectEqual(reserveDataAfter, expectedReserveData);
|
||||||
expectEqual(userDataAfter, expectedUserData);
|
expectEqual(userDataAfter, expectedUserData);
|
||||||
|
|
||||||
|
|
|
@ -956,8 +956,6 @@ export const calcExpectedReserveDataAfterStableRateRebalance = (
|
||||||
): ReserveData => {
|
): ReserveData => {
|
||||||
const expectedReserveData: ReserveData = <ReserveData>{};
|
const expectedReserveData: ReserveData = <ReserveData>{};
|
||||||
|
|
||||||
console.log("Rebalancing");
|
|
||||||
|
|
||||||
expectedReserveData.address = reserveDataBeforeAction.address;
|
expectedReserveData.address = reserveDataBeforeAction.address;
|
||||||
|
|
||||||
const userStableDebt = calcExpectedStableDebtTokenBalance(
|
const userStableDebt = calcExpectedStableDebtTokenBalance(
|
||||||
|
|
|
@ -558,14 +558,14 @@ makeSuite('LendingPool. repayWithCollateral()', (testEnv: TestEnv) => {
|
||||||
new BigNumber(repayWithCollateralTimestamp)
|
new BigNumber(repayWithCollateralTimestamp)
|
||||||
).minus(daiUserDataBefore.currentVariableDebt);
|
).minus(daiUserDataBefore.currentVariableDebt);
|
||||||
|
|
||||||
expect(daiUserDataAfter.currentVariableDebt).to.be.bignumber.equal(
|
expect(daiUserDataAfter.currentVariableDebt).to.be.bignumber.almostEqual(
|
||||||
new BigNumber(daiUserDataBefore.currentVariableDebt)
|
new BigNumber(daiUserDataBefore.currentVariableDebt)
|
||||||
.minus(expectedDebtCovered.toString())
|
.minus(expectedDebtCovered.toString())
|
||||||
.plus(expectedVariableDebtIncrease),
|
.plus(expectedVariableDebtIncrease),
|
||||||
'INVALID_VARIABLE_DEBT_POSITION'
|
'INVALID_VARIABLE_DEBT_POSITION'
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(wethUserDataAfter.currentATokenBalance).to.be.bignumber.equal(0);
|
expect(wethUserDataAfter.currentATokenBalance).to.be.bignumber.almostEqual(0);
|
||||||
|
|
||||||
expect(wethUserDataAfter.usageAsCollateralEnabled).to.be.false;
|
expect(wethUserDataAfter.usageAsCollateralEnabled).to.be.false;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue
Block a user