Skip to content

Commit 29ff9b9

Browse files
miguelmtzinfsakulstrakyzia551
authored
fix: Fix event checks in test cases (#824)
* fix: Fix event emission checks in tests chai matchers * fix await emit in tests * fix: await emit Co-authored-by: Lukas <[email protected]> Co-authored-by: Andrei Kozlov <[email protected]>
1 parent 2437c56 commit 29ff9b9

18 files changed

+111
-121
lines changed

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
4545
expect(priorSourcesPrices).to.eql(['0']);
4646

4747
// Add asset source
48-
expect(
49-
await aaveOracle
48+
await expect(
49+
aaveOracle
5050
.connect(poolAdmin.signer)
5151
.setAssetSources([mockToken.address], [mockAggregator.address])
5252
)
@@ -69,10 +69,8 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
6969
expect(daiSource).to.be.not.eq(ZERO_ADDRESS);
7070

7171
// Update DAI source
72-
expect(
73-
await aaveOracle
74-
.connect(poolAdmin.signer)
75-
.setAssetSources([dai.address], [mockAggregator.address])
72+
await expect(
73+
aaveOracle.connect(poolAdmin.signer).setAssetSources([dai.address], [mockAggregator.address])
7674
)
7775
.to.emit(aaveOracle, 'AssetSourceUpdated')
7876
.withArgs(dai.address, mockAggregator.address);
@@ -113,10 +111,8 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
113111
const { poolAdmin, aaveOracle, weth } = testEnv;
114112

115113
// Add asset source for BASE_CURRENCY address
116-
expect(
117-
await aaveOracle
118-
.connect(poolAdmin.signer)
119-
.setAssetSources([weth.address], [mockAggregator.address])
114+
await expect(
115+
aaveOracle.connect(poolAdmin.signer).setAssetSources([weth.address], [mockAggregator.address])
120116
)
121117
.to.emit(aaveOracle, 'AssetSourceUpdated')
122118
.withArgs(weth.address, mockAggregator.address);
@@ -149,8 +145,8 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
149145
expect(await aaveOracle.getSourceOfAsset(mockToken.address)).to.be.eq(ZERO_ADDRESS);
150146

151147
// Add asset source
152-
expect(
153-
await aaveOracle
148+
await expect(
149+
aaveOracle
154150
.connect(poolAdmin.signer)
155151
.setAssetSources([mockToken.address], [zeroPriceMockAgg.address])
156152
)
@@ -173,8 +169,8 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
173169
expect(await aaveOracle.getSourceOfAsset(mockToken.address)).to.be.eq(ZERO_ADDRESS);
174170

175171
// Add asset source
176-
expect(
177-
await aaveOracle
172+
await expect(
173+
aaveOracle
178174
.connect(poolAdmin.signer)
179175
.setAssetSources([mockToken.address], [zeroPriceMockAgg.address])
180176
)
@@ -191,7 +187,7 @@ makeSuite('AaveOracle', (testEnv: TestEnv) => {
191187
expect(await aaveOracle.getFallbackOracle()).to.be.eq(oracle.address);
192188

193189
// Update oracle source
194-
expect(await aaveOracle.connect(poolAdmin.signer).setFallbackOracle(ONE_ADDRESS))
190+
await expect(aaveOracle.connect(poolAdmin.signer).setFallbackOracle(ONE_ADDRESS))
195191
.to.emit(aaveOracle, 'FallbackOracleUpdated')
196192
.withArgs(ONE_ADDRESS);
197193

‎test-suites/aave-protocol-data-provider.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ makeSuite('AaveProtocolDataProvider: Edge cases', (testEnv: TestEnv) => {
2323
const oldPoolImpl = await getProxyImplementation(addressesProvider.address, poolProxyAddress);
2424

2525
// Update the addressesProvider with a mock pool
26-
expect(await addressesProvider.connect(poolAdmin.signer).setPoolImpl(mockPool.address))
26+
await expect(addressesProvider.connect(poolAdmin.signer).setPoolImpl(mockPool.address))
2727
.to.emit(addressesProvider, 'PoolUpdated')
2828
.withArgs(oldPoolImpl, mockPool.address);
2929

‎test-suites/addresses-provider-registry.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ makeSuite('AddressesProviderRegistry', (testEnv: TestEnv) => {
4040

4141
const providersBefore = await registry.getAddressesProvidersList();
4242

43-
expect(
44-
await registry.registerAddressesProvider(
43+
await expect(
44+
registry.registerAddressesProvider(
4545
NEW_ADDRESSES_PROVIDER_ADDRESS,
4646
NEW_ADDRESSES_PROVIDER_ID_2
4747
)
@@ -72,7 +72,7 @@ makeSuite('AddressesProviderRegistry', (testEnv: TestEnv) => {
7272
const { users, registry } = testEnv;
7373

7474
// Simulating an addresses provider using the users[2] wallet address
75-
expect(await registry.registerAddressesProvider(users[2].address, NEW_ADDRESSES_PROVIDER_ID_3))
75+
await expect(registry.registerAddressesProvider(users[2].address, NEW_ADDRESSES_PROVIDER_ID_3))
7676
.to.emit(registry, 'AddressesProviderRegistered')
7777
.withArgs(users[2].address, NEW_ADDRESSES_PROVIDER_ID_3);
7878

@@ -97,7 +97,7 @@ makeSuite('AddressesProviderRegistry', (testEnv: TestEnv) => {
9797
await registry.getAddressesProviderIdByAddress(NEW_ADDRESSES_PROVIDER_ADDRESS)
9898
).to.be.equal(NEW_ADDRESSES_PROVIDER_ID_2);
9999

100-
expect(await registry.unregisterAddressesProvider(NEW_ADDRESSES_PROVIDER_ADDRESS))
100+
await expect(registry.unregisterAddressesProvider(NEW_ADDRESSES_PROVIDER_ADDRESS))
101101
.to.emit(registry, 'AddressesProviderUnregistered')
102102
.withArgs(NEW_ADDRESSES_PROVIDER_ADDRESS, NEW_ADDRESSES_PROVIDER_ID_2);
103103

@@ -177,8 +177,8 @@ makeSuite('AddressesProviderRegistry', (testEnv: TestEnv) => {
177177

178178
const providersBefore = await registry.getAddressesProvidersList();
179179

180-
expect(
181-
await registry.registerAddressesProvider(
180+
await expect(
181+
registry.registerAddressesProvider(
182182
NEW_ADDRESSES_PROVIDER_ADDRESS,
183183
NEW_ADDRESSES_PROVIDER_ID_2
184184
)
@@ -212,7 +212,7 @@ makeSuite('AddressesProviderRegistry', (testEnv: TestEnv) => {
212212
const providerToRemove = providersBefore[providersBefore.length - 1];
213213
const providerToRemoveId = await registry.getAddressesProviderIdByAddress(providerToRemove);
214214

215-
expect(await registry.unregisterAddressesProvider(providerToRemove))
215+
await expect(registry.unregisterAddressesProvider(providerToRemove))
216216
.to.emit(registry, 'AddressesProviderUnregistered')
217217
.withArgs(providerToRemove, providerToRemoveId);
218218

‎test-suites/atoken-delegation-aware.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ makeSuite('AToken: DelegationAwareAToken', (testEnv: TestEnv) => {
3838
it('Delegates to user 2', async () => {
3939
const { users } = testEnv;
4040

41-
expect(await delegationAToken.delegateUnderlyingTo(users[2].address))
41+
await expect(delegationAToken.delegateUnderlyingTo(users[2].address))
4242
.to.emit(delegationAToken, 'DelegateUnderlyingTo')
4343
.withArgs(users[2].address);
4444

‎test-suites/atoken-edge.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ makeSuite('AToken: Edge cases', (testEnv: TestEnv) => {
7171

7272
it('approve() with a ZERO_ADDRESS spender', async () => {
7373
const { users, aDai } = testEnv;
74-
expect(await aDai.connect(users[0].signer).approve(ZERO_ADDRESS, MAX_UINT_AMOUNT))
74+
await expect(aDai.connect(users[0].signer).approve(ZERO_ADDRESS, MAX_UINT_AMOUNT))
7575
.to.emit(aDai, 'Approval')
7676
.withArgs(users[0].address, ZERO_ADDRESS, MAX_UINT_AMOUNT);
7777
});
@@ -105,14 +105,14 @@ makeSuite('AToken: Edge cases', (testEnv: TestEnv) => {
105105

106106
it('transfer() with a ZERO_ADDRESS recipient', async () => {
107107
const { users, aDai } = testEnv;
108-
expect(await aDai.connect(users[1].signer).transfer(ZERO_ADDRESS, 0))
108+
await expect(aDai.connect(users[1].signer).transfer(ZERO_ADDRESS, 0))
109109
.to.emit(aDai, 'Transfer')
110110
.withArgs(users[1].address, ZERO_ADDRESS, 0);
111111
});
112112

113113
it('transfer() with a ZERO_ADDRESS origin', async () => {
114114
const { users, aDai } = testEnv;
115-
expect(await aDai.connect(users[1].signer).transferFrom(ZERO_ADDRESS, users[1].address, 0))
115+
await expect(aDai.connect(users[1].signer).transferFrom(ZERO_ADDRESS, users[1].address, 0))
116116
.to.emit(aDai, 'Transfer')
117117
.withArgs(ZERO_ADDRESS, users[1].address, 0);
118118
});
@@ -141,7 +141,7 @@ makeSuite('AToken: Edge cases', (testEnv: TestEnv) => {
141141
const poolSigner = await hre.ethers.getSigner(pool.address);
142142

143143
const mintingAmount = await convertToCurrencyDecimals(aDai.address, '100');
144-
expect(
144+
await expect(
145145
aDai
146146
.connect(poolSigner)
147147
.mint(ZERO_ADDRESS, ZERO_ADDRESS, mintingAmount, utils.parseUnits('1', 27))
@@ -174,8 +174,8 @@ makeSuite('AToken: Edge cases', (testEnv: TestEnv) => {
174174
const poolSigner = await hre.ethers.getSigner(pool.address);
175175

176176
const burnAmount = await convertToCurrencyDecimals(aDai.address, '100');
177-
expect(
178-
await aDai
177+
await expect(
178+
aDai
179179
.connect(poolSigner)
180180
.burn(ZERO_ADDRESS, users[0].address, burnAmount, utils.parseUnits('1', 27))
181181
)

‎test-suites/atoken-transfer.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
3636

3737
expect(await aDai.getPreviousIndex(users[0].address)).to.be.gt(0);
3838

39-
expect(await aDai.connect(users[0].signer).transfer(users[0].address, amountDAItoDeposit))
39+
await expect(aDai.connect(users[0].signer).transfer(users[0].address, amountDAItoDeposit))
4040
.to.emit(aDai, 'Transfer')
4141
.withArgs(users[0].address, users[0].address, amountDAItoDeposit);
4242

@@ -71,7 +71,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
7171

7272
expect(await pool.connect(users[0].signer).setUserUseReserveAsCollateral(dai.address, false));
7373

74-
expect(await aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit))
74+
await expect(aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit))
7575
.to.emit(aDai, 'Transfer')
7676
.withArgs(users[0].address, users[1].address, amountDAItoDeposit);
7777

@@ -112,7 +112,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
112112
.deposit(dai.address, amountDAItoDeposit, users[0].address, '0')
113113
);
114114

115-
expect(await aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoTransfer))
115+
await expect(aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoTransfer))
116116
.to.emit(aDai, 'Transfer')
117117
.withArgs(users[0].address, users[1].address, amountDAItoTransfer);
118118
expect(await aDai.balanceOf(users[0].address)).to.be.eq(
@@ -124,7 +124,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
124124
INVALID_TO_BALANCE_AFTER_TRANSFER
125125
);
126126

127-
expect(await aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoTransfer))
127+
await expect(aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoTransfer))
128128
.to.emit(aDai, 'Transfer')
129129
.withArgs(users[0].address, users[1].address, amountDAItoTransfer);
130130
expect(await aDai.balanceOf(users[0].address)).to.be.eq(
@@ -136,7 +136,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
136136
INVALID_TO_BALANCE_AFTER_TRANSFER
137137
);
138138

139-
expect(await aDai.connect(users[0].signer).transfer(users[1].address, 0))
139+
await expect(aDai.connect(users[0].signer).transfer(users[1].address, 0))
140140
.to.emit(aDai, 'Transfer')
141141
.withArgs(users[0].address, users[1].address, 0);
142142
expect(await aDai.balanceOf(users[0].address)).to.be.eq(
@@ -168,7 +168,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
168168
.deposit(dai.address, amountDAItoDeposit, users[0].address, '0')
169169
);
170170

171-
expect(await aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit))
171+
await expect(aDai.connect(users[0].signer).transfer(users[1].address, amountDAItoDeposit))
172172
.to.emit(aDai, 'Transfer')
173173
.withArgs(users[0].address, users[1].address, amountDAItoDeposit);
174174

@@ -232,7 +232,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
232232

233233
const aDAItoTransfer = await convertToCurrencyDecimals(dai.address, '100');
234234

235-
expect(await aDai.connect(users[1].signer).transfer(users[0].address, aDAItoTransfer))
235+
await expect(aDai.connect(users[1].signer).transfer(users[0].address, aDAItoTransfer))
236236
.to.emit(aDai, 'Transfer')
237237
.withArgs(users[1].address, users[0].address, aDAItoTransfer);
238238

‎test-suites/configurator-borrow-cap.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
121121
const { borrowCap: daiOldBorrowCap } = await helpersContract.getReserveCaps(dai.address);
122122

123123
const newCap = 10;
124-
expect(await configurator.setBorrowCap(usdc.address, newCap))
124+
await expect(configurator.setBorrowCap(usdc.address, newCap))
125125
.to.emit(configurator, 'BorrowCapChanged')
126126
.withArgs(usdc.address, daiOldBorrowCap, newCap);
127-
expect(await configurator.setBorrowCap(dai.address, newCap))
127+
await expect(configurator.setBorrowCap(dai.address, newCap))
128128
.to.emit(configurator, 'BorrowCapChanged')
129129
.withArgs(dai.address, usdcOldBorrowCap, newCap);
130130

@@ -179,10 +179,10 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
179179
const { borrowCap: usdcOldBorrowCap } = await helpersContract.getReserveCaps(usdc.address);
180180
const { borrowCap: daiOldBorrowCap } = await helpersContract.getReserveCaps(dai.address);
181181

182-
expect(await configurator.setBorrowCap(usdc.address, newCap))
182+
await expect(configurator.setBorrowCap(usdc.address, newCap))
183183
.to.emit(configurator, 'BorrowCapChanged')
184184
.withArgs(usdc.address, usdcOldBorrowCap, newCap);
185-
expect(await configurator.setBorrowCap(dai.address, newCap))
185+
await expect(configurator.setBorrowCap(dai.address, newCap))
186186
.to.emit(configurator, 'BorrowCapChanged')
187187
.withArgs(dai.address, daiOldBorrowCap, newCap);
188188

@@ -224,7 +224,7 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
224224
const { borrowCap: wethOldBorrowCap } = await helpersContract.getReserveCaps(weth.address);
225225

226226
const newCap = 2;
227-
expect(await configurator.setBorrowCap(weth.address, newCap))
227+
await expect(configurator.setBorrowCap(weth.address, newCap))
228228
.to.emit(configurator, 'BorrowCapChanged')
229229
.withArgs(weth.address, wethOldBorrowCap, newCap);
230230

@@ -307,10 +307,10 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
307307
const { borrowCap: daiOldBorrowCap } = await helpersContract.getReserveCaps(dai.address);
308308

309309
const newCap = '1000';
310-
expect(await configurator.setBorrowCap(usdc.address, newCap))
310+
await expect(configurator.setBorrowCap(usdc.address, newCap))
311311
.to.emit(configurator, 'BorrowCapChanged')
312312
.withArgs(usdc.address, usdcOldBorrowCap, newCap);
313-
expect(await configurator.setBorrowCap(dai.address, newCap))
313+
await expect(configurator.setBorrowCap(dai.address, newCap))
314314
.to.emit(configurator, 'BorrowCapChanged')
315315
.withArgs(dai.address, daiOldBorrowCap, newCap);
316316

@@ -353,10 +353,10 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
353353
const { borrowCap: daiOldBorrowCap } = await helpersContract.getReserveCaps(dai.address);
354354

355355
const newCap = '200';
356-
expect(await configurator.setBorrowCap(usdc.address, newCap))
356+
await expect(configurator.setBorrowCap(usdc.address, newCap))
357357
.to.emit(configurator, 'BorrowCapChanged')
358358
.withArgs(usdc.address, usdcOldBorrowCap, newCap);
359-
expect(await configurator.setBorrowCap(dai.address, newCap))
359+
await expect(configurator.setBorrowCap(dai.address, newCap))
360360
.to.emit(configurator, 'BorrowCapChanged')
361361
.withArgs(dai.address, daiOldBorrowCap, newCap);
362362

@@ -399,10 +399,10 @@ makeSuite('PoolConfigurator: Borrow Cap', (testEnv: TestEnv) => {
399399
const { borrowCap: daiOldBorrowCap } = await helpersContract.getReserveCaps(dai.address);
400400

401401
const newCap = MAX_BORROW_CAP;
402-
expect(await configurator.setBorrowCap(usdc.address, newCap))
402+
await expect(configurator.setBorrowCap(usdc.address, newCap))
403403
.to.emit(configurator, 'BorrowCapChanged')
404404
.withArgs(usdc.address, usdcOldBorrowCap, newCap);
405-
expect(await configurator.setBorrowCap(dai.address, newCap))
405+
await expect(configurator.setBorrowCap(dai.address, newCap))
406406
.to.emit(configurator, 'BorrowCapChanged')
407407
.withArgs(dai.address, daiOldBorrowCap, newCap);
408408

‎test-suites/configurator-liquidation-protocol-fee.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ makeSuite('PoolConfigurator: Liquidation Protocol Fee', (testEnv: TestEnv) => {
4444

4545
const liquidationProtocolFee = 1000;
4646

47-
expect(await configurator.setLiquidationProtocolFee(usdc.address, liquidationProtocolFee))
47+
await expect(configurator.setLiquidationProtocolFee(usdc.address, liquidationProtocolFee))
4848
.to.emit(configurator, 'LiquidationProtocolFeeChanged')
4949
.withArgs(usdc.address, oldUsdcLiquidationProtocolFee, liquidationProtocolFee);
50-
expect(await configurator.setLiquidationProtocolFee(dai.address, liquidationProtocolFee))
50+
await expect(configurator.setLiquidationProtocolFee(dai.address, liquidationProtocolFee))
5151
.to.emit(configurator, 'LiquidationProtocolFeeChanged')
5252
.withArgs(dai.address, oldDaiLiquidationProtocolFee, liquidationProtocolFee);
5353

@@ -72,10 +72,10 @@ makeSuite('PoolConfigurator: Liquidation Protocol Fee', (testEnv: TestEnv) => {
7272

7373
const liquidationProtocolFee = 10000;
7474

75-
expect(await configurator.setLiquidationProtocolFee(usdc.address, liquidationProtocolFee))
75+
await expect(configurator.setLiquidationProtocolFee(usdc.address, liquidationProtocolFee))
7676
.to.emit(configurator, 'LiquidationProtocolFeeChanged')
7777
.withArgs(usdc.address, oldUsdcLiquidationProtocolFee, liquidationProtocolFee);
78-
expect(await configurator.setLiquidationProtocolFee(dai.address, liquidationProtocolFee))
78+
await expect(configurator.setLiquidationProtocolFee(dai.address, liquidationProtocolFee))
7979
.to.emit(configurator, 'LiquidationProtocolFeeChanged')
8080
.withArgs(dai.address, oldDaiLiquidationProtocolFee, liquidationProtocolFee);
8181

0 commit comments

Comments
 (0)