Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rebalance rate tests

Browse Source
This commit is contained in:
The3D 2020-09-21 15:52:53 +02:00
parent 6f9ff11e49
commit 56be9304c2
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/helpers/actions.ts
View File

@ -372,22 +372,6 @@ export const borrow = async (
timestamp
);
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 act ", reserveDataAfter.availableLiquidity.toFixed());
console.log("avg borrow rate exp ", expectedReserveData.averageStableBorrowRate.toFixed());
console.log("avl borrow rate act ", reserveDataAfter.averageStableBorrowRate.toFixed());
console.log("liquidity rate exp ", expectedReserveData.averageStableBorrowRate.toFixed());
console.log("avl borrow rate act ", reserveDataAfter.averageStableBorrowRate.toFixed());
expectEqual(reserveDataAfter, expectedReserveData);
expectEqual(userDataAfter, expectedUserData);

8
test/helpers/utils/calculations.ts
View File

@ -392,12 +392,13 @@ export const calcExpectedReserveDataAfterBorrow = (
expectedReserveData.totalLiquidity
);
} else {
expectedReserveData.principalStableDebt = reserveDataBeforeAction.principalStableDebt;
const totalStableDebtAfterTx = calcExpectedStableDebtTokenBalance(
reserveDataBeforeAction.principalStableDebt,
reserveDataBeforeAction.averageStableBorrowRate,
reserveDataBeforeAction.lastUpdateTimestamp,
reserveDataBeforeAction.totalStableDebtLastUpdated,
txTimestamp
);
@ -630,7 +631,9 @@ export const calcExpectedUserDataAfterBorrow = (
);
expectedUserData.scaledVariableDebt = userDataBeforeAction.scaledVariableDebt;
} else {
expectedUserData.scaledVariableDebt = reserveDataBeforeAction.scaledVariableDebt.plus(
amountBorrowedBN.rayDiv(expectedDataAfterAction.variableBorrowIndex)
);
@ -654,6 +657,7 @@ export const calcExpectedUserDataAfterBorrow = (
expectedUserData,
currentTimestamp
);
expectedUserData.liquidityRate = expectedDataAfterAction.liquidityRate;
expectedUserData.usageAsCollateralEnabled = userDataBeforeAction.usageAsCollateralEnabled;
@ -952,6 +956,8 @@ export const calcExpectedReserveDataAfterStableRateRebalance = (
): ReserveData => {
const expectedReserveData: ReserveData = <ReserveData>{};
console.log("Rebalancing");
expectedReserveData.address = reserveDataBeforeAction.address;
const userStableDebt = calcExpectedStableDebtTokenBalance(

3
test/upgradeability.spec.ts
View File

@ -23,9 +23,10 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
const aTokenInstance = await deployContract<MockAToken>(eContractid.MockAToken, [
pool.address,
dai.address,
ZERO_ADDRESS,
'Aave Interest bearing DAI updated',
'aDAI',
ZERO_ADDRESS,
ZERO_ADDRESS
]);
const stableDebtTokenInstance = await deployContract<MockStableDebtToken>(