Skip to content

Commit

Permalink
Remove Promise.all usage
Browse files Browse the repository at this point in the history
  • Loading branch information
shark0der committed Jan 6, 2023
1 parent 540b29b commit 6358a32
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 30 deletions.
9 changes: 3 additions & 6 deletions test/unit/Pool/removeAsset.js
Expand Up @@ -34,12 +34,9 @@ describe('removeAsset', function () {
const { pool, dai, stETH, chainlinkDAI, chainlinkSteth } = this;
const [governance] = this.accounts.governanceContracts;

// get contract factories using await promise.all()
const [ERC20Mock, ChainlinkAggregatorMock, PriceFeedOracle] = await Promise.all([
ethers.getContractFactory('ERC20Mock'),
ethers.getContractFactory('ChainlinkAggregatorMock'),
ethers.getContractFactory('PriceFeedOracle'),
]);
const ERC20Mock = await ethers.getContractFactory('ERC20Mock');
const ChainlinkAggregatorMock = await ethers.getContractFactory('ChainlinkAggregatorMock');
const PriceFeedOracle = await ethers.getContractFactory('PriceFeedOracle');

const coverToken = await ERC20Mock.deploy();
const investmentToken = await ERC20Mock.deploy();
Expand Down
8 changes: 3 additions & 5 deletions test/unit/Pool/setSwapDetailsLastSwapTime.js
Expand Up @@ -10,11 +10,9 @@ describe('setSwapDetailsLastSwapTime', function () {
const { pool, dai, stETH, chainlinkDAI, chainlinkSteth } = this;
const [governance] = this.accounts.governanceContracts;

const [ERC20Mock, ChainlinkAggregatorMock, PriceFeedOracle] = await Promise.all([
ethers.getContractFactory('ERC20Mock'),
ethers.getContractFactory('ChainlinkAggregatorMock'),
ethers.getContractFactory('PriceFeedOracle'),
]);
const ERC20Mock = await ethers.getContractFactory('ERC20Mock');
const ChainlinkAggregatorMock = await ethers.getContractFactory('ChainlinkAggregatorMock');
const PriceFeedOracle = await ethers.getContractFactory('PriceFeedOracle');

const otherToken = await ERC20Mock.deploy();

Expand Down
9 changes: 3 additions & 6 deletions test/unit/Pool/transferAssetToSwapOperator.js
Expand Up @@ -11,12 +11,9 @@ describe('transferAssetToSwapOperator', function () {
governanceContracts: [governance],
} = this.accounts;

// import factories using ethers and Promise.all()
const [ERC20Mock, ChainlinkAggregatorMock, PriceFeedOracle] = await Promise.all([
ethers.getContractFactory('ERC20Mock'),
ethers.getContractFactory('ChainlinkAggregatorMock'),
ethers.getContractFactory('PriceFeedOracle'),
]);
const ERC20Mock = await ethers.getContractFactory('ERC20Mock');
const ChainlinkAggregatorMock = await ethers.getContractFactory('ChainlinkAggregatorMock');
const PriceFeedOracle = await ethers.getContractFactory('PriceFeedOracle');

const otherToken = await ERC20Mock.deploy();

Expand Down
22 changes: 9 additions & 13 deletions test/unit/Pool/upgradeCapitalPool.js
Expand Up @@ -11,12 +11,10 @@ describe('upgradeCapitalPool', function () {
const [governance] = this.accounts.governanceContracts;
const { defaultSender } = this.accounts;

const [ChainlinkAggregatorMock, ERC20Mock, PriceFeedOracle, Pool] = await Promise.all([
ethers.getContractFactory('ChainlinkAggregatorMock'),
ethers.getContractFactory('ERC20Mock'),
ethers.getContractFactory('PriceFeedOracle'),
ethers.getContractFactory('Pool'),
]);
const ERC20Mock = await ethers.getContractFactory('ERC20Mock');
const ChainlinkAggregatorMock = await ethers.getContractFactory('ChainlinkAggregatorMock');
const PriceFeedOracle = await ethers.getContractFactory('PriceFeedOracle');
const Pool = await ethers.getContractFactory('Pool');

const chainlinkNewAsset = await ChainlinkAggregatorMock.deploy();
await chainlinkNewAsset.setLatestAnswer(parseEther('1'));
Expand Down Expand Up @@ -71,13 +69,11 @@ describe('upgradeCapitalPool', function () {
const tokenAmount = parseEther('100000');
await governance.sendTransaction({ value: ethAmount, to: pool.address });

const [ChainlinkAggregatorMock, ERC20Mock, ERC20NonRevertingMock, PriceFeedOracle, Pool] = await Promise.all([
ethers.getContractFactory('ChainlinkAggregatorMock'),
ethers.getContractFactory('ERC20Mock'),
ethers.getContractFactory('ERC20NonRevertingMock'),
ethers.getContractFactory('PriceFeedOracle'),
ethers.getContractFactory('Pool'),
]);
const ChainlinkAggregatorMock = await ethers.getContractFactory('ChainlinkAggregatorMock');
const ERC20Mock = await ethers.getContractFactory('ERC20Mock');
const ERC20NonRevertingMock = await ethers.getContractFactory('ERC20NonRevertingMock');
const PriceFeedOracle = await ethers.getContractFactory('PriceFeedOracle');
const Pool = await ethers.getContractFactory('Pool');

const coverToken = await ERC20Mock.deploy();
const nonRevertingERC20 = await ERC20NonRevertingMock.deploy();
Expand Down

0 comments on commit 6358a32

Please sign in to comment.