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 test suites to work with new deployment functionality

Browse Source
This commit is contained in:
Zer0dot 2021-02-10 18:23:20 -05:00
parent fda95dd318
commit d131afb6a0
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test-suites/test-aave/helpers/utils/calculations.ts
View File

@ -8,6 +8,7 @@ import {
} from '../../../../helpers/types';
import './math';
import { ReserveData, UserReserveData } from './interfaces';
import { expect } from 'chai';
export const strToBN = (amount: string): BigNumber => new BigNumber(amount);
@ -1243,29 +1244,29 @@ export const calcExpectedInterestRates = (
];
let stableBorrowRate: BigNumber = marketStableRate;
let variableBorrowRate: BigNumber = new BigNumber(reserveConfiguration.baseVariableBorrowRate);
let variableBorrowRate: BigNumber = new BigNumber(reserveConfiguration.strategy.baseVariableBorrowRate);
const optimalRate = new BigNumber(reserveConfiguration.optimalUtilizationRate);
const optimalRate = new BigNumber(reserveConfiguration.strategy.optimalUtilizationRate);
const excessRate = new BigNumber(RAY).minus(optimalRate);
if (utilizationRate.gt(optimalRate)) {
const excessUtilizationRateRatio = utilizationRate
.minus(reserveConfiguration.optimalUtilizationRate)
.minus(reserveConfiguration.strategy.optimalUtilizationRate)
.rayDiv(excessRate);
stableBorrowRate = stableBorrowRate
.plus(reserveConfiguration.stableRateSlope1)
.plus(reserveConfiguration.strategy.stableRateSlope1)
.plus(
new BigNumber(reserveConfiguration.stableRateSlope2).rayMul(excessUtilizationRateRatio)
new BigNumber(reserveConfiguration.strategy.stableRateSlope2).rayMul(excessUtilizationRateRatio)
);
variableBorrowRate = variableBorrowRate
.plus(reserveConfiguration.variableRateSlope1)
.plus(reserveConfiguration.strategy.variableRateSlope1)
.plus(
new BigNumber(reserveConfiguration.variableRateSlope2).rayMul(excessUtilizationRateRatio)
new BigNumber(reserveConfiguration.strategy.variableRateSlope2).rayMul(excessUtilizationRateRatio)
);
} else {
stableBorrowRate = stableBorrowRate.plus(
new BigNumber(reserveConfiguration.stableRateSlope1).rayMul(
new BigNumber(reserveConfiguration.strategy.stableRateSlope1).rayMul(
utilizationRate.rayDiv(new BigNumber(optimalRate))
)
);
@ -1273,7 +1274,7 @@ export const calcExpectedInterestRates = (
variableBorrowRate = variableBorrowRate.plus(
utilizationRate
.rayDiv(optimalRate)
.rayMul(new BigNumber(reserveConfiguration.variableRateSlope1))
.rayMul(new BigNumber(reserveConfiguration.strategy.variableRateSlope1))
);
}

18
test-suites/test-lp/helpers/utils/calculations.ts
View File

@ -1247,29 +1247,29 @@ export const calcExpectedInterestRates = (
];
let stableBorrowRate: BigNumber = marketStableRate;
let variableBorrowRate: BigNumber = new BigNumber(reserveConfiguration.baseVariableBorrowRate);
let variableBorrowRate: BigNumber = new BigNumber(reserveConfiguration.strategy.baseVariableBorrowRate);
const optimalRate = new BigNumber(reserveConfiguration.optimalUtilizationRate);
const optimalRate = new BigNumber(reserveConfiguration.strategy.optimalUtilizationRate);
const excessRate = new BigNumber(RAY).minus(optimalRate);
if (utilizationRate.gt(optimalRate)) {
const excessUtilizationRateRatio = utilizationRate
.minus(reserveConfiguration.optimalUtilizationRate)
.minus(reserveConfiguration.strategy.optimalUtilizationRate)
.rayDiv(excessRate);
stableBorrowRate = stableBorrowRate
.plus(reserveConfiguration.stableRateSlope1)
.plus(reserveConfiguration.strategy.stableRateSlope1)
.plus(
new BigNumber(reserveConfiguration.stableRateSlope2).rayMul(excessUtilizationRateRatio)
new BigNumber(reserveConfiguration.strategy.stableRateSlope2).rayMul(excessUtilizationRateRatio)
);
variableBorrowRate = variableBorrowRate
.plus(reserveConfiguration.variableRateSlope1)
.plus(reserveConfiguration.strategy.variableRateSlope1)
.plus(
new BigNumber(reserveConfiguration.variableRateSlope2).rayMul(excessUtilizationRateRatio)
new BigNumber(reserveConfiguration.strategy.variableRateSlope2).rayMul(excessUtilizationRateRatio)
);
} else {
stableBorrowRate = stableBorrowRate.plus(
new BigNumber(reserveConfiguration.stableRateSlope1).rayMul(
new BigNumber(reserveConfiguration.strategy.stableRateSlope1).rayMul(
utilizationRate.rayDiv(new BigNumber(optimalRate))
)
);
@ -1277,7 +1277,7 @@ export const calcExpectedInterestRates = (
variableBorrowRate = variableBorrowRate.plus(
utilizationRate
.rayDiv(optimalRate)
.rayMul(new BigNumber(reserveConfiguration.variableRateSlope1))
.rayMul(new BigNumber(reserveConfiguration.strategy.variableRateSlope1))
);
}