Skip to content

Commit 6319f22

Browse files
kartojalkartojal
committed
tests: fixed tests to support latest changes
1 parent 79294d0 commit 6319f22

File tree

4 files changed

+67
-42
lines changed

4 files changed

+67
-42
lines changed

‎helpers/configuration.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ export const loadPoolConfig = (configName: ConfigNames): PoolConfiguration => {
3535
case ConfigNames.Commons:
3636
return CommonsConfig;
3737
default:
38-
throw new Error(`Unsupported pool configuration: ${Object.values(ConfigNames)}`);
38+
throw new Error(
39+
`Unsupported pool configuration: ${configName} is not one of the supported configs ${Object.values(
40+
ConfigNames
41+
)}`
42+
);
3943
}
4044
};
4145

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test-suites/test-aave/__setup.spec.ts‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
deployLendingPoolConfigurator,
1414
deployLendingPool,
1515
deployPriceOracle,
16-
deployAaveOracle,
16+
deployAaveOracleV2,
1717
deployLendingPoolCollateralManager,
1818
deployMockFlashLoanReceiver,
1919
deployWalletBalancerProvider,
@@ -28,8 +28,8 @@ import {
2828
deployUniswapRepayAdapter,
2929
deployFlashLiquidationAdapter,
3030
authorizeWETHGateway,
31+
deployATokenImplementations,
3132
} from '../../helpers/contracts-deployments';
32-
import { eEthereumNetwork } from '../../helpers/types';
3333
import { Signer } from 'ethers';
3434
import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
3535
import { MintableERC20 } from '../../types/MintableERC20';
@@ -49,7 +49,7 @@ import {
4949
import { DRE, waitForTx } from '../../helpers/misc-utils';
5050
import { initReservesByHelper, configureReservesByHelper } from '../../helpers/init-helpers';
5151
import AaveConfig from '../../markets/aave';
52-
import { ZERO_ADDRESS } from '../../helpers/constants';
52+
import { oneEther, ZERO_ADDRESS } from '../../helpers/constants';
5353
import {
5454
getLendingPool,
5555
getLendingPoolConfiguratorProxy,
@@ -60,7 +60,6 @@ import { WETH9Mocked } from '../../types/WETH9Mocked';
6060
const MOCK_USD_PRICE_IN_WEI = AaveConfig.ProtocolGlobalParams.MockUsdPriceInWei;
6161
const ALL_ASSETS_INITIAL_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices;
6262
const USD_ADDRESS = AaveConfig.ProtocolGlobalParams.UsdAddress;
63-
const MOCK_CHAINLINK_AGGREGATORS_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices;
6463
const LENDING_RATE_ORACLE_RATES_COMMON = AaveConfig.LendingRateOracleRatesCommon;
6564

6665
const deployAllMockTokens = async (deployer: Signer) => {
@@ -96,9 +95,13 @@ const deployAllMockTokens = async (deployer: Signer) => {
9695
const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
9796
console.time('setup');
9897
const aaveAdmin = await deployer.getAddress();
98+
const config = loadPoolConfig(ConfigNames.Aave);
9999

100-
const mockTokens = await deployAllMockTokens(deployer);
101-
console.log('Deployed mocks');
100+
const mockTokens: {
101+
[symbol: string]: MockContract | MintableERC20 | WETH9Mocked;
102+
} = {
103+
...(await deployAllMockTokens(deployer)),
104+
};
102105
const addressesProvider = await deployLendingPoolAddressesProvider(AaveConfig.MarketId);
103106
await waitForTx(await addressesProvider.setPoolAdmin(aaveAdmin));
104107

@@ -195,8 +198,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
195198
fallbackOracle
196199
);
197200

198-
const mockAggregators = await deployAllMockAggregators(MOCK_CHAINLINK_AGGREGATORS_PRICES);
199-
console.log('Mock aggs deployed');
201+
const mockAggregators = await deployAllMockAggregators(ALL_ASSETS_INITIAL_PRICES);
200202
const allTokenAddresses = Object.entries(mockTokens).reduce(
201203
(accum: { [tokenSymbol: string]: tEthereumAddress }, [tokenSymbol, tokenContract]) => ({
202204
...accum,
@@ -212,9 +214,19 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
212214
{}
213215
);
214216

215-
const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
217+
const [tokens, aggregators] = getPairsTokenAggregator(
218+
allTokenAddresses,
219+
allAggregatorsAddresses,
220+
config.OracleQuoteCurrency
221+
);
216222

217-
await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address]);
223+
await deployAaveOracleV2([
224+
tokens,
225+
aggregators,
226+
fallbackOracle.address,
227+
mockTokens.WETH.address,
228+
oneEther.toString(),
229+
]);
218230
await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address));
219231

220232
const lendingRateOracle = await deployLendingRateOracle();
@@ -231,23 +243,19 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
231243
aaveAdmin
232244
);
233245

234-
const reservesParams = getReservesConfigByPool(AavePools.proto);
246+
// Reserve params from AAVE pool + mocked tokens
247+
const reservesParams = {
248+
...config.ReservesConfig,
249+
};
235250

236251
const testHelpers = await deployAaveProtocolDataProvider(addressesProvider.address);
237252

238-
await insertContractAddressInDb(eContractid.AaveProtocolDataProvider, testHelpers.address);
239-
const admin = await deployer.getAddress();
240-
241-
console.log('Initialize configuration');
253+
await deployATokenImplementations(ConfigNames.Aave, reservesParams, false);
242254

243-
const config = loadPoolConfig(ConfigNames.Aave);
255+
const admin = await deployer.getAddress();
244256

245-
const {
246-
ATokenNamePrefix,
247-
StableDebtTokenNamePrefix,
248-
VariableDebtTokenNamePrefix,
249-
SymbolPrefix,
250-
} = config;
257+
const { ATokenNamePrefix, StableDebtTokenNamePrefix, VariableDebtTokenNamePrefix, SymbolPrefix } =
258+
config;
251259
const treasuryAddress = await getTreasuryAddress(config);
252260

253261
await initReservesByHelper(
@@ -260,6 +268,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
260268
admin,
261269
treasuryAddress,
262270
ZERO_ADDRESS,
271+
ConfigNames.Aave,
263272
false
264273
);
265274

@@ -297,7 +306,7 @@ before(async () => {
297306
const FORK = process.env.FORK;
298307

299308
if (FORK) {
300-
await rawBRE.run('aave:mainnet');
309+
await rawBRE.run('aave:mainnet', { skipRegistry: true });
301310
} else {
302311
console.log('-> Deploying test environment...');
303312
await buildTestEnv(deployer, secondaryWallet);

‎test-suites/test-amm/__setup.spec.ts‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
deployLendingPoolConfigurator,
1414
deployLendingPool,
1515
deployPriceOracle,
16-
deployAaveOracle,
16+
deployAaveOracleV2,
1717
deployLendingPoolCollateralManager,
1818
deployMockFlashLoanReceiver,
1919
deployWalletBalancerProvider,
@@ -28,6 +28,7 @@ import {
2828
deployUniswapRepayAdapter,
2929
deployFlashLiquidationAdapter,
3030
authorizeWETHGateway,
31+
deployATokenImplementations,
3132
} from '../../helpers/contracts-deployments';
3233
import { Signer } from 'ethers';
3334
import { TokenContractId, eContractid, tEthereumAddress, AavePools } from '../../helpers/types';
@@ -48,7 +49,7 @@ import {
4849
import { DRE, waitForTx } from '../../helpers/misc-utils';
4950
import { initReservesByHelper, configureReservesByHelper } from '../../helpers/init-helpers';
5051
import AmmConfig from '../../markets/amm';
51-
import { ZERO_ADDRESS } from '../../helpers/constants';
52+
import { oneEther, ZERO_ADDRESS } from '../../helpers/constants';
5253
import {
5354
getLendingPool,
5455
getLendingPoolConfiguratorProxy,
@@ -95,6 +96,14 @@ const deployAllMockTokens = async (deployer: Signer) => {
9596
const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
9697
console.time('setup');
9798
const aaveAdmin = await deployer.getAddress();
99+
const config = loadPoolConfig(ConfigNames.Amm);
100+
const {
101+
ATokenNamePrefix,
102+
StableDebtTokenNamePrefix,
103+
VariableDebtTokenNamePrefix,
104+
SymbolPrefix,
105+
ReservesConfig,
106+
} = config;
98107

99108
const mockTokens = await deployAllMockTokens(deployer);
100109

@@ -189,6 +198,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
189198
WMATIC: mockTokens.WMATIC.address,
190199
USD: USD_ADDRESS,
191200
STAKE: mockTokens.STAKE.address,
201+
xSUSHI: ZERO_ADDRESS,
192202
},
193203
fallbackOracle
194204
);
@@ -210,9 +220,19 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
210220
{}
211221
);
212222

213-
const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses);
223+
const [tokens, aggregators] = getPairsTokenAggregator(
224+
allTokenAddresses,
225+
allAggregatorsAddresses,
226+
config.OracleQuoteCurrency
227+
);
214228

215-
await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address]);
229+
await deployAaveOracleV2([
230+
tokens,
231+
aggregators,
232+
fallbackOracle.address,
233+
mockTokens.WETH.address,
234+
oneEther.toString(),
235+
]);
216236
await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address));
217237

218238
const lendingRateOracle = await deployLendingRateOracle();
@@ -228,8 +248,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
228248
lendingRateOracle,
229249
aaveAdmin
230250
);
231-
232-
const reservesParams = getReservesConfigByPool(AavePools.amm);
251+
await deployATokenImplementations(ConfigNames.Amm, ReservesConfig);
233252

234253
const testHelpers = await deployAaveProtocolDataProvider(addressesProvider.address);
235254

@@ -238,18 +257,10 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
238257

239258
console.log('Initialize configuration');
240259

241-
const config = loadPoolConfig(ConfigNames.Amm);
242-
243-
const {
244-
ATokenNamePrefix,
245-
StableDebtTokenNamePrefix,
246-
VariableDebtTokenNamePrefix,
247-
SymbolPrefix,
248-
} = config;
249260
const treasuryAddress = await getTreasuryAddress(config);
250261

251262
await initReservesByHelper(
252-
reservesParams,
263+
ReservesConfig,
253264
allReservesAddresses,
254265
ATokenNamePrefix,
255266
StableDebtTokenNamePrefix,
@@ -258,9 +269,10 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
258269
admin,
259270
treasuryAddress,
260271
ZERO_ADDRESS,
272+
ConfigNames.Amm,
261273
false
262274
);
263-
await configureReservesByHelper(reservesParams, allReservesAddresses, testHelpers, admin);
275+
await configureReservesByHelper(ReservesConfig, allReservesAddresses, testHelpers, admin);
264276

265277
const collateralManager = await deployLendingPoolCollateralManager();
266278
await waitForTx(
@@ -294,7 +306,7 @@ before(async () => {
294306
const FORK = process.env.FORK;
295307

296308
if (FORK) {
297-
await rawBRE.run('amm:mainnet');
309+
await rawBRE.run('amm:mainnet', { skipRegistry: true });
298310
} else {
299311
console.log('-> Deploying test environment...');
300312
await buildTestEnv(deployer, secondaryWallet);

0 commit comments

Comments
 (0)