From 88a2cb21f4a7d6fcb32d608a20b720022e065edc Mon Sep 17 00:00:00 2001 From: David Racero Date: Thu, 15 Oct 2020 13:57:03 +0200 Subject: [PATCH] Move contract getters to their own file. Use factory connect. Fix imports --- helpers/contracts-getters.ts | 193 +++++++++++++++++ helpers/contracts-helpers.ts | 242 ++-------------------- tasks/dev/3_lending_pool.ts | 8 +- tasks/dev/4_oracles.ts | 9 +- tasks/dev/5_initialize.ts | 10 +- tasks/full/1_address_provider_registry.ts | 2 +- tasks/full/2_lending_pool.ts | 8 +- tasks/full/3_oracles.ts | 6 +- tasks/full/5_initialize.ts | 9 +- test/__setup.spec.ts | 8 +- test/addresses-provider-registry.spec.ts | 3 +- 11 files changed, 250 insertions(+), 248 deletions(-) diff --git a/helpers/contracts-getters.ts b/helpers/contracts-getters.ts index e69de29b..74f77627 100644 --- a/helpers/contracts-getters.ts +++ b/helpers/contracts-getters.ts @@ -0,0 +1,193 @@ +import { + AaveProtocolTestHelpersFactory, + ATokenFactory, + DefaultReserveInterestRateStrategyFactory, + LendingPoolAddressesProviderFactory, + LendingPoolAddressesProviderRegistryFactory, + LendingPoolConfiguratorFactory, + LendingPoolFactory, + LendingRateOracleFactory, + MintableErc20Factory, + MockFlashLoanReceiverFactory, + MockSwapAdapterFactory, + PriceOracleFactory, + StableDebtTokenFactory, + VariableDebtTokenFactory, +} from '../types'; +import {Ierc20DetailedFactory} from '../types/Ierc20DetailedFactory'; +import {MockTokenMap} from './contracts-helpers'; +import {BRE, getDb} from './misc-utils'; +import {eContractid, PoolConfiguration, tEthereumAddress, TokenContractId} from './types'; + +export const getLendingPoolAddressesProvider = async (address?: tEthereumAddress) => + await LendingPoolAddressesProviderFactory.connect( + address || + (await getDb().get(`${eContractid.LendingPoolAddressesProvider}.${BRE.network.name}`).value()) + .address, + BRE.ethers.provider + ); + +export const getLendingPoolConfiguratorProxy = async (address?: tEthereumAddress) => { + return await LendingPoolConfiguratorFactory.connect( + address || + (await getDb().get(`${eContractid.LendingPoolConfigurator}.${BRE.network.name}`).value()) + .address, + BRE.ethers.provider + ); +}; + +export const getLendingPool = async (address?: tEthereumAddress) => + await LendingPoolFactory.connect( + address || + (await getDb().get(`${eContractid.LendingPool}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getPriceOracle = async (address?: tEthereumAddress) => + await PriceOracleFactory.connect( + address || + (await getDb().get(`${eContractid.PriceOracle}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getAToken = async (address?: tEthereumAddress) => + await ATokenFactory.connect( + address || (await getDb().get(`${eContractid.AToken}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getStableDebtToken = async (address?: tEthereumAddress) => + await StableDebtTokenFactory.connect( + address || + (await getDb().get(`${eContractid.StableDebtToken}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getVariableDebtToken = async (address?: tEthereumAddress) => + await VariableDebtTokenFactory.connect( + address || + (await getDb().get(`${eContractid.VariableDebtToken}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getMintableErc20 = async (address: tEthereumAddress) => + await MintableErc20Factory.connect( + address || + (await getDb().get(`${eContractid.MintableERC20}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getIErc20Detailed = async (address: tEthereumAddress) => + await Ierc20DetailedFactory.connect( + address || + (await getDb().get(`${eContractid.IERC20Detailed}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getAaveProtocolTestHelpers = async (address?: tEthereumAddress) => + await AaveProtocolTestHelpersFactory.connect( + address || + (await getDb().get(`${eContractid.AaveProtocolTestHelpers}.${BRE.network.name}`).value()) + .address, + BRE.ethers.provider + ); + +export const getInterestRateStrategy = async (address?: tEthereumAddress) => + await DefaultReserveInterestRateStrategyFactory.connect( + address || + ( + await getDb() + .get(`${eContractid.DefaultReserveInterestRateStrategy}.${BRE.network.name}`) + .value() + ).address, + BRE.ethers.provider + ); + +export const getMockFlashLoanReceiver = async (address?: tEthereumAddress) => + await MockFlashLoanReceiverFactory.connect( + address || + (await getDb().get(`${eContractid.MockFlashLoanReceiver}.${BRE.network.name}`).value()) + .address, + BRE.ethers.provider + ); + +export const getMockSwapAdapter = async (address?: tEthereumAddress) => + await MockSwapAdapterFactory.connect( + address || + (await getDb().get(`${eContractid.MockSwapAdapter}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getLendingRateOracle = async (address?: tEthereumAddress) => + await LendingRateOracleFactory.connect( + address || + (await getDb().get(`${eContractid.LendingRateOracle}.${BRE.network.name}`).value()).address, + BRE.ethers.provider + ); + +export const getMockedTokens = async (config: PoolConfiguration) => { + const tokenSymbols = config.ReserveSymbols; + const db = getDb(); + const tokens: MockTokenMap = await tokenSymbols.reduce>( + async (acc, tokenSymbol) => { + const accumulator = await acc; + const address = db.get(`${tokenSymbol.toUpperCase()}.${BRE.network.name}`).value().address; + accumulator[tokenSymbol] = await getMintableErc20(address); + return Promise.resolve(acc); + }, + Promise.resolve({}) + ); + return tokens; +}; + +export const getAllMockedTokens = async () => { + const db = getDb(); + const tokens: MockTokenMap = await Object.keys(TokenContractId).reduce>( + async (acc, tokenSymbol) => { + const accumulator = await acc; + const address = db.get(`${tokenSymbol.toUpperCase()}.${BRE.network.name}`).value().address; + accumulator[tokenSymbol] = await getMintableErc20(address); + return Promise.resolve(acc); + }, + Promise.resolve({}) + ); + return tokens; +}; + +export const getPairsTokenAggregator = ( + allAssetsAddresses: { + [tokenSymbol: string]: tEthereumAddress; + }, + aggregatorsAddresses: {[tokenSymbol: string]: tEthereumAddress} +): [string[], string[]] => { + const {ETH, USD, WETH, ...assetsAddressesWithoutEth} = allAssetsAddresses; + + const pairs = Object.entries(assetsAddressesWithoutEth).map(([tokenSymbol, tokenAddress]) => { + if (tokenSymbol !== 'WETH' && tokenSymbol !== 'ETH') { + const aggregatorAddressIndex = Object.keys(aggregatorsAddresses).findIndex( + (value) => value === tokenSymbol + ); + const [, aggregatorAddress] = (Object.entries(aggregatorsAddresses) as [ + string, + tEthereumAddress + ][])[aggregatorAddressIndex]; + return [tokenAddress, aggregatorAddress]; + } + }) as [string, string][]; + + const mappedPairs = pairs.map(([asset]) => asset); + const mappedAggregators = pairs.map(([, source]) => source); + + return [mappedPairs, mappedAggregators]; +}; + +export const getLendingPoolAddressesProviderRegistry = async (address?: tEthereumAddress) => + await LendingPoolAddressesProviderRegistryFactory.connect( + address || + ( + await getDb() + .get(`${eContractid.LendingPoolAddressesProviderRegistry}.${BRE.network.name}`) + .value() + ).address, + BRE.ethers.provider + ); diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts index 77730b04..a7853cea 100644 --- a/helpers/contracts-helpers.ts +++ b/helpers/contracts-helpers.ts @@ -12,7 +12,6 @@ import { TokenContractId, iMultiPoolsAssets, IReserveParams, - ICommonConfiguration, PoolConfiguration, } from './types'; @@ -23,9 +22,6 @@ import {LendingPoolConfigurator} from '../types/LendingPoolConfigurator'; import {readArtifact} from '@nomiclabs/buidler/plugins'; import {Artifact} from '@nomiclabs/buidler/types'; import {LendingPool} from '../types/LendingPool'; -import {PriceOracle} from '../types/PriceOracle'; -import {MockAggregator} from '../types/MockAggregator'; -import {LendingRateOracle} from '../types/LendingRateOracle'; import {DefaultReserveInterestRateStrategy} from '../types/DefaultReserveInterestRateStrategy'; import {LendingPoolCollateralManager} from '../types/LendingPoolCollateralManager'; import {InitializableAdminUpgradeabilityProxy} from '../types/InitializableAdminUpgradeabilityProxy'; @@ -34,7 +30,6 @@ import {WalletBalanceProvider} from '../types/WalletBalanceProvider'; import {AToken} from '../types/AToken'; import {AaveProtocolTestHelpers} from '../types/AaveProtocolTestHelpers'; import BigNumber from 'bignumber.js'; -import {Ierc20Detailed} from '../types/Ierc20Detailed'; import {StableDebtToken} from '../types/StableDebtToken'; import {VariableDebtToken} from '../types/VariableDebtToken'; import {MockContract} from 'ethereum-waffle'; @@ -50,7 +45,15 @@ import {ZERO_ADDRESS} from './constants'; import {MockSwapAdapter} from '../types/MockSwapAdapter'; import {signTypedData_v4, TypedData} from 'eth-sig-util'; import {fromRpcSig, ECDSASignature} from 'ethereumjs-util'; -import {SignerWithAddress} from '../test/helpers/make-suite'; + +import { + ChainlinkProxyPriceProviderFactory, + LendingPoolCollateralManagerFactory, + LendingRateOracleFactory, + MockAggregatorFactory, + PriceOracleFactory, +} from '../types'; +import {getIErc20Detailed} from './contracts-getters'; export const registerContractInJsonDb = async (contractId: string, contractInstance: Contract) => { const currentNetwork = BRE.network.name; @@ -213,7 +216,7 @@ export const deployLendingPool = async (verify?: boolean) => { }; export const deployPriceOracle = async (verify?: boolean) => { - const instance = await deployContract(eContractid.PriceOracle, []); + const instance = await new PriceOracleFactory().deploy(); if (verify) { await verifyContract(eContractid.PriceOracle, instance.address, []); } @@ -221,7 +224,7 @@ export const deployPriceOracle = async (verify?: boolean) => { }; export const deployLendingRateOracle = async (verify?: boolean) => { - const instance = await deployContract(eContractid.LendingRateOracle, []); + const instance = await new LendingRateOracleFactory().deploy(); if (verify) { await verifyContract(eContractid.LendingRateOracle, instance.address, []); } @@ -229,8 +232,8 @@ export const deployLendingRateOracle = async (verify?: boolean) => { }; export const deployMockAggregator = async (price: tStringTokenSmallUnits, verify?: boolean) => { - const args = [price]; - const instance = await deployContract(eContractid.MockAggregator, args); + const args: [tStringTokenSmallUnits] = [price]; + const instance = await new MockAggregatorFactory().deploy(...args); if (verify) { await verifyContract(eContractid.MockAggregator, instance.address, args); } @@ -245,11 +248,12 @@ export const deployChainlinkProxyPriceProvider = async ( ], verify?: boolean ) => { - const args = [assetsAddresses, sourcesAddresses, fallbackOracleAddress]; - const instance = await deployContract( - eContractid.ChainlinkProxyPriceProvider, - args - ); + const args: [tEthereumAddress[], tEthereumAddress[], tEthereumAddress] = [ + assetsAddresses, + sourcesAddresses, + fallbackOracleAddress, + ]; + const instance = await new ChainlinkProxyPriceProviderFactory().deploy(...args); if (verify) { await verifyContract(eContractid.MockAggregator, instance.address, args); } @@ -257,8 +261,7 @@ export const deployChainlinkProxyPriceProvider = async ( }; export const getChainlingProxyPriceProvider = async (address?: tEthereumAddress) => - await getContract( - eContractid.ChainlinkProxyPriceProvider, + new ChainlinkProxyPriceProviderFactory().attach( address || (await getDb().get(`${eContractid.ChainlinkProxyPriceProvider}.${BRE.network.name}`).value()) .address @@ -438,132 +441,6 @@ export const deployGenericAToken = async ( return instance; }; -export const getLendingPoolAddressesProvider = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.LendingPoolAddressesProvider, - address || - (await getDb().get(`${eContractid.LendingPoolAddressesProvider}.${BRE.network.name}`).value()) - .address - ); -}; - -export const getLendingPoolConfiguratorProxy = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.LendingPoolConfigurator, - address || - (await getDb().get(`${eContractid.LendingPoolConfigurator}.${BRE.network.name}`).value()) - .address - ); -}; - -export const getLendingPool = async (address?: tEthereumAddress) => { - const lendingPoolArtifact = await readArtifact( - BRE.config.paths.artifacts, - eContractid.LendingPool - ); - - const factory = await linkLibrariesToArtifact(lendingPoolArtifact); - - return ( - await factory.attach( - address || - (await getDb().get(`${eContractid.LendingPool}.${BRE.network.name}`).value()).address - ) - ); -}; - -export const getPriceOracle = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.PriceOracle, - address || (await getDb().get(`${eContractid.PriceOracle}.${BRE.network.name}`).value()).address - ); -}; - -export const getAToken = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.AToken, - address || (await getDb().get(`${eContractid.AToken}.${BRE.network.name}`).value()).address - ); -}; - -export const getStableDebtToken = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.StableDebtToken, - address || - (await getDb().get(`${eContractid.StableDebtToken}.${BRE.network.name}`).value()).address - ); -}; - -export const getVariableDebtToken = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.VariableDebtToken, - address || - (await getDb().get(`${eContractid.VariableDebtToken}.${BRE.network.name}`).value()).address - ); -}; - -export const getMintableErc20 = async (address: tEthereumAddress) => { - return await getContract( - eContractid.MintableERC20, - address || - (await getDb().get(`${eContractid.MintableERC20}.${BRE.network.name}`).value()).address - ); -}; - -export const getIErc20Detailed = async (address: tEthereumAddress) => { - return await getContract( - eContractid.IERC20Detailed, - address || - (await getDb().get(`${eContractid.IERC20Detailed}.${BRE.network.name}`).value()).address - ); -}; - -export const getAaveProtocolTestHelpers = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.AaveProtocolTestHelpers, - address || - (await getDb().get(`${eContractid.AaveProtocolTestHelpers}.${BRE.network.name}`).value()) - .address - ); -}; - -export const getInterestRateStrategy = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.DefaultReserveInterestRateStrategy, - address || - ( - await getDb() - .get(`${eContractid.DefaultReserveInterestRateStrategy}.${BRE.network.name}`) - .value() - ).address - ); -}; - -export const getMockFlashLoanReceiver = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.MockFlashLoanReceiver, - address || - (await getDb().get(`${eContractid.MockFlashLoanReceiver}.${BRE.network.name}`).value()) - .address - ); -}; - -export const getMockSwapAdapter = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.MockSwapAdapter, - address || - (await getDb().get(`${eContractid.MockSwapAdapter}.${BRE.network.name}`).value()).address - ); -}; - -export const getLendingRateOracle = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.LendingRateOracle, - address || - (await getDb().get(`${eContractid.LendingRateOracle}.${BRE.network.name}`).value()).address - ); -}; - const linkBytecode = (artifact: Artifact, libraries: any) => { let bytecode = artifact.bytecode; @@ -688,68 +565,6 @@ export const deployMockTokens = async (config: PoolConfiguration, verify?: boole return tokens; }; -export const getMockedTokens = async (config: PoolConfiguration) => { - const tokenSymbols = config.ReserveSymbols; - const db = getDb(); - const tokens: MockTokenMap = await tokenSymbols.reduce>( - async (acc, tokenSymbol) => { - const accumulator = await acc; - const address = db.get(`${tokenSymbol.toUpperCase()}.${BRE.network.name}`).value().address; - accumulator[tokenSymbol] = await getContract( - eContractid.MintableERC20, - address - ); - return Promise.resolve(acc); - }, - Promise.resolve({}) - ); - return tokens; -}; - -export const getAllMockedTokens = async () => { - const db = getDb(); - const tokens: MockTokenMap = await Object.keys(TokenContractId).reduce>( - async (acc, tokenSymbol) => { - const accumulator = await acc; - const address = db.get(`${tokenSymbol.toUpperCase()}.${BRE.network.name}`).value().address; - accumulator[tokenSymbol] = await getContract( - eContractid.MintableERC20, - address - ); - return Promise.resolve(acc); - }, - Promise.resolve({}) - ); - return tokens; -}; - -export const getPairsTokenAggregator = ( - allAssetsAddresses: { - [tokenSymbol: string]: tEthereumAddress; - }, - aggregatorsAddresses: {[tokenSymbol: string]: tEthereumAddress} -): [string[], string[]] => { - const {ETH, USD, WETH, ...assetsAddressesWithoutEth} = allAssetsAddresses; - - const pairs = Object.entries(assetsAddressesWithoutEth).map(([tokenSymbol, tokenAddress]) => { - if (tokenSymbol !== 'WETH' && tokenSymbol !== 'ETH') { - const aggregatorAddressIndex = Object.keys(aggregatorsAddresses).findIndex( - (value) => value === tokenSymbol - ); - const [, aggregatorAddress] = (Object.entries(aggregatorsAddresses) as [ - string, - tEthereumAddress - ][])[aggregatorAddressIndex]; - return [tokenAddress, aggregatorAddress]; - } - }) as [string, string][]; - - const mappedPairs = pairs.map(([asset]) => asset); - const mappedAggregators = pairs.map(([, source]) => source); - - return [mappedPairs, mappedAggregators]; -}; - export const initReserves = async ( reservesParams: iMultiPoolsAssets, tokenAddresses: {[symbol: string]: tEthereumAddress}, @@ -798,7 +613,6 @@ export const initReserves = async ( stableRateSlope2, }, ] = (Object.entries(reservesParams) as [string, IReserveParams][])[reserveParamIndex]; - console.log('deploy def reserve'); const rateStrategyContract = await deployDefaultReserveInterestRateStrategy( [ lendingPoolAddressesProvider.address, @@ -811,7 +625,6 @@ export const initReserves = async ( verify ); - console.log('deploy stable deb totken ', assetSymbol); const stableDebtToken = await deployStableDebtToken( [ `Aave stable debt bearing ${assetSymbol === 'WETH' ? 'ETH' : assetSymbol}`, @@ -823,7 +636,6 @@ export const initReserves = async ( verify ); - console.log('deploy var deb totken ', assetSymbol); const variableDebtToken = await deployVariableDebtToken( [ `Aave variable debt bearing ${assetSymbol === 'WETH' ? 'ETH' : assetSymbol}`, @@ -835,7 +647,6 @@ export const initReserves = async ( verify ); - console.log('deploy a token ', assetSymbol); const aToken = await deployGenericAToken( [ lendingPool.address, @@ -855,7 +666,6 @@ export const initReserves = async ( } } - console.log('init reserve currency ', assetSymbol); await lendingPoolConfigurator.initReserve( tokenAddress, aToken.address, @@ -870,18 +680,6 @@ export const initReserves = async ( } }; -export const getLendingPoolAddressesProviderRegistry = async (address?: tEthereumAddress) => { - return await getContract( - eContractid.LendingPoolAddressesProviderRegistry, - address || - ( - await getDb() - .get(`${eContractid.LendingPoolAddressesProviderRegistry}.${BRE.network.name}`) - .value() - ).address - ); -}; - export const buildPermitParams = ( chainId: number, token: tEthereumAddress, diff --git a/tasks/dev/3_lending_pool.ts b/tasks/dev/3_lending_pool.ts index b7c88a19..82459557 100644 --- a/tasks/dev/3_lending_pool.ts +++ b/tasks/dev/3_lending_pool.ts @@ -1,14 +1,16 @@ import {task} from '@nomiclabs/buidler/config'; import { deployLendingPool, - getLendingPoolAddressesProvider, - getLendingPool, insertContractAddressInDb, deployLendingPoolConfigurator, - getLendingPoolConfiguratorProxy, } from '../../helpers/contracts-helpers'; import {eContractid} from '../../helpers/types'; import {waitForTx} from '../../helpers/misc-utils'; +import { + getLendingPoolAddressesProvider, + getLendingPool, + getLendingPoolConfiguratorProxy, +} from '../../helpers/contracts-getters'; task('dev:deploy-lending-pool', 'Deploy lending pool for dev enviroment') .addOptionalParam('verify', 'Verify contracts at Etherscan') diff --git a/tasks/dev/4_oracles.ts b/tasks/dev/4_oracles.ts index 0e2d8ef5..5ab756d9 100644 --- a/tasks/dev/4_oracles.ts +++ b/tasks/dev/4_oracles.ts @@ -1,12 +1,8 @@ import {task} from '@nomiclabs/buidler/config'; import { - getLendingPoolAddressesProvider, deployPriceOracle, - getMockedTokens, - getPairsTokenAggregator, deployChainlinkProxyPriceProvider, deployLendingRateOracle, - getAllMockedTokens, } from '../../helpers/contracts-helpers'; import { @@ -18,6 +14,11 @@ import {ICommonConfiguration, iAssetBase, TokenContractId} from '../../helpers/t import {waitForTx} from '../../helpers/misc-utils'; import {getAllAggregatorsAddresses, getAllTokenAddresses} from '../../helpers/mock-helpers'; import {ConfigNames, loadPoolConfig} from '../../helpers/configuration'; +import { + getAllMockedTokens, + getLendingPoolAddressesProvider, + getPairsTokenAggregator, +} from '../../helpers/contracts-getters'; task('dev:deploy-oracles', 'Deploy oracles for dev enviroment') .addOptionalParam('verify', 'Verify contracts at Etherscan') diff --git a/tasks/dev/5_initialize.ts b/tasks/dev/5_initialize.ts index 6333247c..e504decd 100644 --- a/tasks/dev/5_initialize.ts +++ b/tasks/dev/5_initialize.ts @@ -1,15 +1,11 @@ import {task} from '@nomiclabs/buidler/config'; import { - getLendingPoolAddressesProvider, initReserves, deployLendingPoolCollateralManager, insertContractAddressInDb, deployMockFlashLoanReceiver, deployWalletBalancerProvider, deployAaveProtocolTestHelpers, - getLendingPool, - getLendingPoolConfiguratorProxy, - getAllMockedTokens, } from '../../helpers/contracts-helpers'; import {getReservesConfigByPool} from '../../helpers/configuration'; @@ -18,6 +14,12 @@ import {waitForTx, filterMapBy} from '../../helpers/misc-utils'; import {enableReservesToBorrow, enableReservesAsCollateral} from '../../helpers/init-helpers'; import {getAllTokenAddresses} from '../../helpers/mock-helpers'; import {ZERO_ADDRESS} from '../../helpers/constants'; +import { + getAllMockedTokens, + getLendingPool, + getLendingPoolConfiguratorProxy, + getLendingPoolAddressesProvider, +} from '../../helpers/contracts-getters'; task('dev:initialize-lending-pool', 'Initialize lending pool configuration.') .addOptionalParam('verify', 'Verify contracts at Etherscan') diff --git a/tasks/full/1_address_provider_registry.ts b/tasks/full/1_address_provider_registry.ts index ef579579..11195e66 100644 --- a/tasks/full/1_address_provider_registry.ts +++ b/tasks/full/1_address_provider_registry.ts @@ -3,11 +3,11 @@ import { deployLendingPoolAddressesProvider, deployLendingPoolAddressesProviderRegistry, getParamPerNetwork, - getLendingPoolAddressesProviderRegistry, } from '../../helpers/contracts-helpers'; import {waitForTx} from '../../helpers/misc-utils'; import {ConfigNames, loadPoolConfig, getGenesisAaveAdmin} from '../../helpers/configuration'; import {eEthereumNetwork} from '../../helpers/types'; +import {getLendingPoolAddressesProviderRegistry} from '../../helpers/contracts-getters'; task( 'full:deploy-address-provider', diff --git a/tasks/full/2_lending_pool.ts b/tasks/full/2_lending_pool.ts index a4f919ce..5c3fb7f9 100644 --- a/tasks/full/2_lending_pool.ts +++ b/tasks/full/2_lending_pool.ts @@ -1,14 +1,16 @@ import {task} from '@nomiclabs/buidler/config'; import { deployLendingPool, - getLendingPoolAddressesProvider, - getLendingPool, insertContractAddressInDb, deployLendingPoolConfigurator, - getLendingPoolConfiguratorProxy, } from '../../helpers/contracts-helpers'; import {eContractid} from '../../helpers/types'; import {waitForTx} from '../../helpers/misc-utils'; +import { + getLendingPoolAddressesProvider, + getLendingPool, + getLendingPoolConfiguratorProxy, +} from '../../helpers/contracts-getters'; task('full:deploy-lending-pool', 'Deploy lending pool for dev enviroment') .addFlag('verify', 'Verify contracts at Etherscan') diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts index 3121b008..9d640448 100644 --- a/tasks/full/3_oracles.ts +++ b/tasks/full/3_oracles.ts @@ -1,7 +1,5 @@ import {task} from '@nomiclabs/buidler/config'; import { - getLendingPoolAddressesProvider, - getPairsTokenAggregator, deployChainlinkProxyPriceProvider, deployLendingRateOracle, getParamPerNetwork, @@ -12,6 +10,10 @@ import {ICommonConfiguration, eEthereumNetwork, SymbolMap} from '../../helpers/t import {waitForTx, filterMapBy} from '../../helpers/misc-utils'; import {ConfigNames, loadPoolConfig} from '../../helpers/configuration'; import {exit} from 'process'; +import { + getLendingPoolAddressesProvider, + getPairsTokenAggregator, +} from '../../helpers/contracts-getters'; task('full:deploy-oracles', 'Deploy oracles for dev enviroment') .addFlag('verify', 'Verify contracts at Etherscan') diff --git a/tasks/full/5_initialize.ts b/tasks/full/5_initialize.ts index 31900897..1c54fd69 100644 --- a/tasks/full/5_initialize.ts +++ b/tasks/full/5_initialize.ts @@ -1,13 +1,9 @@ import {task} from '@nomiclabs/buidler/config'; import { - getLendingPoolAddressesProvider, initReserves, deployLendingPoolCollateralManager, - insertContractAddressInDb, deployWalletBalancerProvider, deployAaveProtocolTestHelpers, - getLendingPool, - getLendingPoolConfiguratorProxy, getParamPerNetwork, } from '../../helpers/contracts-helpers'; import {loadPoolConfig, ConfigNames} from '../../helpers/configuration'; @@ -17,6 +13,11 @@ import {waitForTx} from '../../helpers/misc-utils'; import {enableReservesToBorrow, enableReservesAsCollateral} from '../../helpers/init-helpers'; import {ZERO_ADDRESS} from '../../helpers/constants'; import {exit} from 'process'; +import { + getLendingPool, + getLendingPoolConfiguratorProxy, + getLendingPoolAddressesProvider, +} from '../../helpers/contracts-getters'; task('full:initialize-lending-pool', 'Initialize lending pool configuration.') .addFlag('verify', 'Verify contracts at Etherscan') diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts index 676ae52a..5a40570e 100644 --- a/test/__setup.spec.ts +++ b/test/__setup.spec.ts @@ -7,17 +7,14 @@ import { deployLendingPoolConfigurator, deployLendingPool, deployPriceOracle, - getLendingPoolConfiguratorProxy, deployChainlinkProxyPriceProvider, deployLendingPoolCollateralManager, deployMockFlashLoanReceiver, deployWalletBalancerProvider, - getLendingPool, insertContractAddressInDb, deployAaveProtocolTestHelpers, getEthersSigners, registerContractInJsonDb, - getPairsTokenAggregator, initReserves, deployMockSwapAdapter, deployLendingRateOracle, @@ -38,6 +35,11 @@ import {waitForTx} from '../helpers/misc-utils'; import {enableReservesToBorrow, enableReservesAsCollateral} from '../helpers/init-helpers'; import {AaveConfig} from '../config/aave'; import {ZERO_ADDRESS} from '../helpers/constants'; +import { + getLendingPool, + getLendingPoolConfiguratorProxy, + getPairsTokenAggregator, +} from '../helpers/contracts-getters'; const MOCK_USD_PRICE_IN_WEI = AaveConfig.ProtocolGlobalParams.MockUsdPriceInWei; const ALL_ASSETS_INITIAL_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices; diff --git a/test/addresses-provider-registry.spec.ts b/test/addresses-provider-registry.spec.ts index 457514e4..7baead04 100644 --- a/test/addresses-provider-registry.spec.ts +++ b/test/addresses-provider-registry.spec.ts @@ -1,6 +1,5 @@ import {TestEnv, makeSuite} from './helpers/make-suite'; -import {RAY, APPROVAL_AMOUNT_LENDING_POOL, ZERO_ADDRESS} from '../helpers/constants'; -import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; +import {ZERO_ADDRESS} from '../helpers/constants'; import {ProtocolErrors} from '../helpers/types'; const {expect} = require('chai');