From 0652b09ffd2fc44500cd519e53a5e07d32dab7f8 Mon Sep 17 00:00:00 2001 From: Zer0dot Date: Wed, 10 Feb 2021 19:11:41 -0500 Subject: [PATCH] Slight fixes for tests to run and removed old gas tracker --- helpers/gas-tracker.ts | 10 ---------- tasks/full/1_address_provider.ts | 5 ----- tasks/full/3_oracles.ts | 3 --- tasks/full/5_initialize.ts | 2 -- tasks/migrations/aave.mainnet.ts | 2 -- tasks/migrations/lp.mainnet.ts | 4 ---- test-suites/test-aave/scenario.spec.ts | 2 +- test-suites/test-lp/scenario.spec.ts | 2 +- 8 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 helpers/gas-tracker.ts diff --git a/helpers/gas-tracker.ts b/helpers/gas-tracker.ts deleted file mode 100644 index 0e165a00..00000000 --- a/helpers/gas-tracker.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * @dev This is a simple script that keeps track of gas spent during deployment. - */ -import { BigNumber } from 'ethers'; - -export var totalGas:BigNumber = BigNumber.from(0); - -export function addGas(amount: BigNumber) { - totalGas = totalGas.add(amount); -} \ No newline at end of file diff --git a/tasks/full/1_address_provider.ts b/tasks/full/1_address_provider.ts index 08cc7ea0..ae5fabc0 100644 --- a/tasks/full/1_address_provider.ts +++ b/tasks/full/1_address_provider.ts @@ -20,7 +20,6 @@ import { formatEther, isAddress, parseEther } from 'ethers/lib/utils'; import { isZeroAddress } from 'ethereumjs-util'; import { Signer, BigNumber } from 'ethers'; import { parse } from 'path'; -import { addGas } from '../../helpers/gas-tracker'; //import BigNumber from 'bignumber.js'; task( @@ -95,10 +94,6 @@ task( // 4. Set pool admins - - addGas(await addressesProvider.estimateGas.setPoolAdmin(await getGenesisPoolAdmin(poolConfig))); - addGas(await addressesProvider.estimateGas.setEmergencyAdmin(await getEmergencyAdmin(poolConfig))); - await waitForTx(await addressesProvider.setPoolAdmin(await getGenesisPoolAdmin(poolConfig))); await waitForTx(await addressesProvider.setEmergencyAdmin(await getEmergencyAdmin(poolConfig))); diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts index ce830b8c..3c37eb74 100644 --- a/tasks/full/3_oracles.ts +++ b/tasks/full/3_oracles.ts @@ -17,7 +17,6 @@ import { getLendingRateOracle, getPairsTokenAggregator, } from '../../helpers/contracts-getters'; -import { addGas } from '../../helpers/gas-tracker'; task('full:deploy-oracles', 'Deploy oracles for dev enviroment') .addFlag('verify', 'Verify contracts at Etherscan') @@ -69,8 +68,6 @@ task('full:deploy-oracles', 'Deploy oracles for dev enviroment') } console.log("ORACLES: %s and %s", aaveOracle.address, lendingRateOracle.address); // Register the proxy price provider on the addressesProvider - addGas(await addressesProvider.estimateGas.setPriceOracle(aaveOracle.address)); - addGas(await addressesProvider.estimateGas.setLendingRateOracle(lendingRateOracle.address)); await waitForTx(await addressesProvider.setPriceOracle(aaveOracle.address)); await waitForTx(await addressesProvider.setLendingRateOracle(lendingRateOracle.address)); } catch (error) { diff --git a/tasks/full/5_initialize.ts b/tasks/full/5_initialize.ts index 813a6a3e..9999f6f1 100644 --- a/tasks/full/5_initialize.ts +++ b/tasks/full/5_initialize.ts @@ -21,7 +21,6 @@ import { getLendingPoolAddressesProvider, } from '../../helpers/contracts-getters'; import { ZERO_ADDRESS } from '../../helpers/constants'; -import { addGas } from '../../helpers/gas-tracker'; task('full:initialize-lending-pool', 'Initialize lending pool configuration.') .addFlag('verify', 'Verify contracts at Etherscan') @@ -58,7 +57,6 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.') const collateralManager = await deployLendingPoolCollateralManager(verify); - addGas(await addressesProvider.estimateGas.setLendingPoolCollateralManager(collateralManager.address)); await waitForTx( await addressesProvider.setLendingPoolCollateralManager(collateralManager.address) ); diff --git a/tasks/migrations/aave.mainnet.ts b/tasks/migrations/aave.mainnet.ts index a987451c..96bcbbb8 100644 --- a/tasks/migrations/aave.mainnet.ts +++ b/tasks/migrations/aave.mainnet.ts @@ -3,7 +3,6 @@ import { checkVerification } from '../../helpers/etherscan-verification'; import { ConfigNames } from '../../helpers/configuration'; import { printContracts } from '../../helpers/misc-utils'; import { usingTenderly } from '../../helpers/tenderly-utils'; -import {totalGas} from '../../helpers/gas-tracker'; task('aave:mainnet', 'Deploy development enviroment') .addFlag('verify', 'Verify contracts at Etherscan') @@ -48,5 +47,4 @@ task('aave:mainnet', 'Deploy development enviroment') } console.log('\nFinished migrations'); printContracts(); - console.log("Total gas used:", totalGas.toString()); }); diff --git a/tasks/migrations/lp.mainnet.ts b/tasks/migrations/lp.mainnet.ts index 9b23a499..70121c03 100644 --- a/tasks/migrations/lp.mainnet.ts +++ b/tasks/migrations/lp.mainnet.ts @@ -4,7 +4,6 @@ import {checkVerification} from '../../helpers/etherscan-verification'; import {ConfigNames} from '../../helpers/configuration'; import {EthereumNetworkNames} from '../../helpers/types'; import {printContracts} from '../../helpers/misc-utils'; -import {totalGas} from '../../helpers/gas-tracker'; task('lp:mainnet', 'Deploy development enviroment') .addFlag('verify', 'Verify contracts at Etherscan') @@ -24,8 +23,6 @@ task('lp:mainnet', 'Deploy development enviroment') const provider = new DRE.ethers.providers.Web3Provider(DRE.tenderlyRPC as any); DRE.ethers.provider = provider; } - // addGas(1); - // console.log(totalGas); console.log('Migration started\n'); @@ -59,5 +56,4 @@ task('lp:mainnet', 'Deploy development enviroment') } console.log('\nFinished migrations'); printContracts(); - console.log("Total gas used:", totalGas.toString()); }); diff --git a/test-suites/test-aave/scenario.spec.ts b/test-suites/test-aave/scenario.spec.ts index 55f02cad..68b792d5 100644 --- a/test-suites/test-aave/scenario.spec.ts +++ b/test-suites/test-aave/scenario.spec.ts @@ -8,7 +8,7 @@ import { getReservesConfigByPool } from '../../helpers/configuration'; import { AavePools, iAavePoolAssets, IReserveParams } from '../../helpers/types'; import { executeStory } from './helpers/scenario-engine'; -const scenarioFolder = './test/helpers/scenarios/'; +const scenarioFolder = './test-suites/test-aave/helpers/scenarios/'; const selectedScenarios: string[] = []; diff --git a/test-suites/test-lp/scenario.spec.ts b/test-suites/test-lp/scenario.spec.ts index 076ae9db..99bed044 100644 --- a/test-suites/test-lp/scenario.spec.ts +++ b/test-suites/test-lp/scenario.spec.ts @@ -8,7 +8,7 @@ import { getReservesConfigByPool } from '../../helpers/configuration'; import { AavePools, iLpPoolAssets, IReserveParams } from '../../helpers/types'; import { executeStory } from './helpers/scenario-engine'; -const scenarioFolder = './test/helpers/scenarios/'; +const scenarioFolder = './test-suites/test-lp/helpers/scenarios/'; const selectedScenarios: string[] = [];