mirror of
https://github.com/Instadapp/aave-protocol-v2.git
synced 2024-07-29 21:47:30 +00:00
Fixed tests
This commit is contained in:
The3D
parent
51fee50e50
commit
c298579908
|
|
@ -5,7 +5,6 @@ import {ILendingPoolAddressesProvider} from "../interfaces/ILendingPoolAddresses
|
|||
import {IERC20Detailed} from "../interfaces/IERC20Detailed.sol";
|
||||
import {LendingPool} from "../lendingpool/LendingPool.sol";
|
||||
import {AToken} from "../tokenization/AToken.sol";
|
||||
import "@nomiclabs/buidler/console.sol";
|
||||
|
||||
contract AaveProtocolTestHelpers {
|
||||
struct TokenData {
|
||||
|
|
@ -21,11 +20,7 @@ contract AaveProtocolTestHelpers {
|
|||
|
||||
function getAllReservesTokens() external view returns(TokenData[] memory) {
|
||||
LendingPool pool = LendingPool(payable(ADDRESSES_PROVIDER.getLendingPool()));
|
||||
console.log("Getting reserves...");
|
||||
|
||||
address[] memory reserves = pool.getReserves();
|
||||
console.log("Reserves retrivied");
|
||||
|
||||
TokenData[] memory reservesTokens = new TokenData[](reserves.length);
|
||||
for (uint256 i = 0; i < reserves.length; i++) {
|
||||
reservesTokens[i] = TokenData({
|
||||
|
|
@ -38,14 +33,9 @@ contract AaveProtocolTestHelpers {
|
|||
|
||||
function getAllATokens() external view returns(TokenData[] memory) {
|
||||
LendingPool pool = LendingPool(payable(ADDRESSES_PROVIDER.getLendingPool()));
|
||||
|
||||
console.log("Getting all the tokens...");
|
||||
address[] memory reserves = pool.getReserves();
|
||||
|
||||
console.log("Reserves retrivied");
|
||||
TokenData[] memory aTokens = new TokenData[](reserves.length);
|
||||
for (uint256 i = 0; i < reserves.length; i++) {
|
||||
console.log("Getting configuration for reserve %s", i);
|
||||
(,,,,address aTokenAddress,,,,) = pool.getReserveConfigurationData(reserves[i]);
|
||||
aTokens[i] = TokenData({
|
||||
symbol: AToken(aTokenAddress).symbol(),
|
||||
|
|
|
|||
6
package-lock.json
generated
6
package-lock.json
generated
|
|
@ -372,9 +372,9 @@
|
|||
}
|
||||
},
|
||||
"@openzeppelin/contracts": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.0.1.tgz",
|
||||
"integrity": "sha512-uSrD7hZ0ViuHGqHZbeHawZBi/uy7aBiNramXAt2dFFuSuoU4u9insS3V3zdVfOnYSPreUo636xSOuQIFN4//HA==",
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.1.0.tgz",
|
||||
"integrity": "sha512-dVXDnUKxrAKLzPdCRkz+N8qsVkK1XxJ6kk3zuI6zaQmcKxN7CkizoDP7lXxcs/Mi2I0mxceTRjJBqlzFffLJrQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@resolver-engine/core": {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"@nomiclabs/buidler-ethers": "1.3.4-rc.0",
|
||||
"@nomiclabs/buidler-etherscan": "1.3.3",
|
||||
"@nomiclabs/buidler-waffle": "1.3.4",
|
||||
"@openzeppelin/contracts": "3.0.1",
|
||||
"@openzeppelin/contracts": "3.1.0",
|
||||
"@typechain/ethers-v4": "1.0.0",
|
||||
"@typechain/truffle-v4": "2.0.2",
|
||||
"@typechain/truffle-v5": "2.0.2",
|
||||
|
|
|
|||
|
|
@ -260,6 +260,7 @@ export const redeem = async (
|
|||
testEnv: TestEnv,
|
||||
revertMessage?: string
|
||||
) => {
|
||||
|
||||
const {
|
||||
aTokenInstance,
|
||||
reserve,
|
||||
|
|
@ -930,6 +931,7 @@ const getDataBeforeAction = async (
|
|||
user: tEthereumAddress,
|
||||
testEnv: TestEnv
|
||||
): Promise<ActionData> => {
|
||||
|
||||
const reserve = await getReserveAddressFromSymbol(reserveSymbol);
|
||||
|
||||
const {reserveData, userData} = await getContractsData(
|
||||
|
|
@ -937,9 +939,7 @@ const getDataBeforeAction = async (
|
|||
user,
|
||||
testEnv
|
||||
);
|
||||
|
||||
const aTokenInstance = await getAToken(reserveData.aTokenAddress);
|
||||
|
||||
return {
|
||||
reserve,
|
||||
reserveData,
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ export const getReserveData = async (
|
|||
reserve: tEthereumAddress
|
||||
): Promise<ReserveData> => {
|
||||
const data: any = await pool.getReserveData(reserve);
|
||||
const configuration: any = await pool.getReserveConfigurationData(reserve);
|
||||
const rateOracle = await getLendingRateOracle();
|
||||
|
||||
const rate = (await rateOracle.getMarketBorrowRate(reserve)).toString();
|
||||
|
|
@ -29,8 +30,15 @@ export const getReserveData = async (
|
|||
decimals = new BigNumber(await token.decimals());
|
||||
}
|
||||
|
||||
|
||||
|
||||
const totalLiquidity = new BigNumber(data.availableLiquidity).plus(data.totalBorrowsStable).plus(data.totalBorrowsVariable);
|
||||
|
||||
const utilizationRate = new BigNumber(totalLiquidity.eq(0) ? 0 : new BigNumber(data.totalBorrowsStable).plus(data.totalBorrowsVariable).rayDiv(totalLiquidity))
|
||||
|
||||
return {
|
||||
totalLiquidity: new BigNumber(data.totalLiquidity),
|
||||
totalLiquidity,
|
||||
utilizationRate,
|
||||
availableLiquidity: new BigNumber(data.availableLiquidity),
|
||||
totalBorrowsStable: new BigNumber(data.totalBorrowsStable),
|
||||
totalBorrowsVariable: new BigNumber(data.totalBorrowsVariable),
|
||||
|
|
@ -38,12 +46,11 @@ export const getReserveData = async (
|
|||
variableBorrowRate: new BigNumber(data.variableBorrowRate),
|
||||
stableBorrowRate: new BigNumber(data.stableBorrowRate),
|
||||
averageStableBorrowRate: new BigNumber(data.averageStableBorrowRate),
|
||||
utilizationRate: new BigNumber(data.utilizationRate),
|
||||
liquidityIndex: new BigNumber(data.liquidityIndex),
|
||||
variableBorrowIndex: new BigNumber(data.variableBorrowIndex),
|
||||
lastUpdateTimestamp: new BigNumber(data.lastUpdateTimestamp),
|
||||
address: reserve,
|
||||
aTokenAddress: data.aTokenAddress,
|
||||
aTokenAddress: configuration.aTokenAddress,
|
||||
symbol,
|
||||
decimals,
|
||||
marketStableRate: new BigNumber(rate),
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ fs.readdirSync(scenarioFolder).forEach((file) => {
|
|||
if (
|
||||
![
|
||||
"borrow-negatives.json",
|
||||
"borrow-repay-variable.json",
|
||||
"borrow-repay-stable.json",
|
||||
"deposit.json",
|
||||
"redeem-negatives.json",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user