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 swap rate mode tests

Browse Source
This commit is contained in:
The3D 2020-09-21 14:29:59 +02:00
parent c8b044aecf
commit 8792515f5b
2 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,7 +391,6 @@ export const calcExpectedReserveDataAfterBorrow = (
expectedReserveData.totalLiquidity
);
} else {
expectedReserveData.principalStableDebt = reserveDataBeforeAction.principalStableDebt;
const totalStableDebtAfterTx = calcExpectedStableDebtTokenBalance(
@ -791,41 +790,59 @@ export const calcExpectedReserveDataAfterSwapRateMode = (
txTimestamp
);
expectedReserveData.liquidityIndex = calcExpectedLiquidityIndex(
reserveDataBeforeAction,
txTimestamp
);
expectedReserveData.variableBorrowIndex = calcExpectedVariableBorrowIndex(
reserveDataBeforeAction,
txTimestamp
);
expectedReserveData.availableLiquidity = reserveDataBeforeAction.availableLiquidity;
const totalStableDebtUntilTx = calcExpectedTotalStableDebt(
reserveDataBeforeAction.principalStableDebt,
reserveDataBeforeAction.averageStableBorrowRate,
reserveDataBeforeAction.lastUpdateTimestamp,
txTimestamp
);
if (rateMode === RateMode.Stable) {
//swap user stable debt to variable
const debtAccrued = stableDebt.minus(userDataBeforeAction.principalStableDebt);
expectedReserveData.scaledVariableDebt = reserveDataBeforeAction.scaledVariableDebt.plus(
stableDebt.rayDiv(expectedReserveData.variableBorrowIndex)
);
expectedReserveData.totalLiquidity = reserveDataBeforeAction.totalLiquidity.plus(debtAccrued);
expectedReserveData.totalVariableDebt = expectedReserveData.scaledVariableDebt.rayMul(
expectedReserveData.variableBorrowIndex
);
expectedReserveData.principalStableDebt = expectedReserveData.totalStableDebt = totalStableDebtUntilTx.minus(stableDebt);
expectedReserveData.averageStableBorrowRate = calcExpectedAverageStableBorrowRate(
reserveDataBeforeAction.averageStableBorrowRate,
reserveDataBeforeAction.totalStableDebt.plus(debtAccrued),
expectedReserveData.principalStableDebt.plus(stableDebt),
stableDebt.negated(),
userDataBeforeAction.stableBorrowRate
);
expectedReserveData.totalVariableDebt = reserveDataBeforeAction.totalVariableDebt.plus(
stableDebt
);
expectedReserveData.totalStableDebt = reserveDataBeforeAction.totalStableDebt.minus(
userDataBeforeAction.principalStableDebt
);
} else {
const totalDebtBefore = userDataBeforeAction.scaledVariableDebt.rayMul(
reserveDataBeforeAction.variableBorrowIndex
);
const debtAccrued = variableDebt.minus(totalDebtBefore);
expectedReserveData.totalLiquidity = reserveDataBeforeAction.totalLiquidity.plus(debtAccrued);
//swap variable to stable
expectedReserveData.totalVariableDebt = reserveDataBeforeAction.totalVariableDebt;
expectedReserveData.totalStableDebt = reserveDataBeforeAction.totalStableDebt.plus(
expectedReserveData.principalStableDebt = expectedReserveData.totalStableDebt = totalStableDebtUntilTx.plus(
variableDebt
);
expectedReserveData.scaledVariableDebt = reserveDataBeforeAction.scaledVariableDebt.minus(
variableDebt.rayDiv(expectedReserveData.variableBorrowIndex)
);
expectedReserveData.totalVariableDebt = expectedReserveData.scaledVariableDebt.rayMul(
expectedReserveData.variableBorrowIndex
);
expectedReserveData.averageStableBorrowRate = calcExpectedAverageStableBorrowRate(
reserveDataBeforeAction.averageStableBorrowRate,
reserveDataBeforeAction.totalStableDebt,
@ -834,6 +851,10 @@ export const calcExpectedReserveDataAfterSwapRateMode = (
);
}
expectedReserveData.totalLiquidity = reserveDataBeforeAction.availableLiquidity
.plus(expectedReserveData.totalStableDebt)
.plus(expectedReserveData.totalVariableDebt);
expectedReserveData.utilizationRate = calcExpectedUtilizationRate(
expectedReserveData.totalStableDebt,
expectedReserveData.totalVariableDebt,
@ -854,15 +875,6 @@ export const calcExpectedReserveDataAfterSwapRateMode = (
expectedReserveData.variableBorrowRate = rates[2];
expectedReserveData.liquidityIndex = calcExpectedLiquidityIndex(
reserveDataBeforeAction,
txTimestamp
);
expectedReserveData.variableBorrowIndex = calcExpectedVariableBorrowIndex(
reserveDataBeforeAction,
txTimestamp
);
return expectedReserveData;
};
@ -876,19 +888,19 @@ export const calcExpectedUserDataAfterSwapRateMode = (
): UserReserveData => {
const expectedUserData = {...userDataBeforeAction};
const variableBorrowBalance = calcExpectedVariableDebtTokenBalance(
reserveDataBeforeAction,
userDataBeforeAction,
txTimestamp
);
const stableBorrowBalance = calcExpectedStableDebtTokenBalance(
const stableDebtBalance = calcExpectedStableDebtTokenBalance(
userDataBeforeAction.principalStableDebt,
userDataBeforeAction.stableBorrowRate,
userDataBeforeAction.stableRateLastUpdated,
txTimestamp
);
const variableDebtBalance = calcExpectedVariableDebtTokenBalance(
reserveDataBeforeAction,
userDataBeforeAction,
txTimestamp
);
expectedUserData.currentATokenBalance = calcExpectedATokenBalance(
reserveDataBeforeAction,
userDataBeforeAction,
@ -901,31 +913,30 @@ export const calcExpectedUserDataAfterSwapRateMode = (
expectedUserData.stableBorrowRate = new BigNumber(0);
expectedUserData.principalVariableDebt = expectedUserData.currentVariableDebt = userDataBeforeAction.currentVariableDebt.plus(
stableBorrowBalance
expectedUserData.scaledVariableDebt = userDataBeforeAction.scaledVariableDebt.plus(
stableDebtBalance.rayDiv(expectedDataAfterAction.variableBorrowIndex)
);
expectedUserData.variableBorrowIndex = expectedDataAfterAction.variableBorrowIndex;
expectedUserData.currentVariableDebt = expectedUserData.scaledVariableDebt.rayMul(
expectedDataAfterAction.variableBorrowIndex
);
expectedUserData.stableRateLastUpdated = new BigNumber(0);
} else {
expectedUserData.principalStableDebt = expectedUserData.currentStableDebt = userDataBeforeAction.currentStableDebt.plus(
variableBorrowBalance
variableDebtBalance
);
//weighted average of the previous and the current
expectedUserData.stableBorrowRate = calcExpectedUserStableRate(
userDataBeforeAction.principalStableDebt,
stableDebtBalance,
userDataBeforeAction.stableBorrowRate,
variableBorrowBalance,
variableDebtBalance,
reserveDataBeforeAction.stableBorrowRate
);
expectedUserData.stableRateLastUpdated = txTimestamp;
expectedUserData.currentVariableDebt = expectedUserData.principalVariableDebt = new BigNumber(
0
);
expectedUserData.variableBorrowIndex = new BigNumber(0);
expectedUserData.currentVariableDebt = expectedUserData.scaledVariableDebt = new BigNumber(0);
}
expectedUserData.liquidityRate = expectedDataAfterAction.liquidityRate;

2
test/scenario.spec.ts
View File

@ -10,7 +10,7 @@ import {executeStory} from './helpers/scenario-engine';
const scenarioFolder = './test/helpers/scenarios/';
const selectedScenarios: string[] = ['borrow-repay-stable.json','borrow-repay-variable.json'];
const selectedScenarios: string[] = ['swap-rate-mode.json'];
fs.readdirSync(scenarioFolder).forEach((file) => {
if (selectedScenarios.length > 0 && !selectedScenarios.includes(file)) return;