Fix more tests with incorrect await / expect ordering

test/Loan.test.ts

@@ -425,7 +425,7 @@ describe("Loan", () => {
       await collateralizeLoan(loan, borrower, liquidityAsset);
       await fundLoan(loan, poolController, poolAdmin);
       await time.increaseTo(await loan.dropDeadTimestamp());
-      expect(await loan.connect(borrower).cancelFunded());
+      await loan.connect(borrower).cancelFunded();
 
       expect(await loan.state()).to.equal(2);
     });

test/Pool.test.ts

@@ -713,17 +713,17 @@ describe("Pool", () => {
         expect(await pool.balanceOf(otherAccount.address)).to.equal(97);
       });
 
-      it("emits a RedeemRequested event if the lender requests a valid amount", async () => {
+      it("emits a WithdrawRequested event if the lender requests to redeem a valid amount", async () => {
         const { pool, poolAdmin, liquidityAsset, otherAccount } =
           await loadFixture(loadPoolFixture);
         await activatePool(pool, poolAdmin, liquidityAsset);
 
         await depositToPool(pool, otherAccount, liquidityAsset, 100);
         const max = await pool.maxRedeemRequest(otherAccount.address);
 
-        expect(await pool.connect(otherAccount).requestRedeem(max))
-          .to.emit(pool.address, "RedeemRequested")
-          .withArgs(otherAccount.address, max);
+        await expect(pool.connect(otherAccount).requestRedeem(max))
+          .to.emit(pool, "WithdrawRequested")
+          .withArgs(otherAccount.address, max, max);
       });
     });
 

test/permissioned/PoolAdminAccessControl.test.ts

@@ -150,15 +150,14 @@ describe("PoolAdminAccessControl", () => {
           .connect(otherAccount)
           .acceptTermsOfService();
 
-        expect(
-          await performVeriteVerification(
-            poolAdminAccessControl,
-            operator,
-            otherAccount
-          )
-        )
+        const txn = await performVeriteVerification(
+          poolAdminAccessControl,
+          operator,
+          otherAccount
+        );
+        await expect(txn)
           .to.emit(poolAdminAccessControl, "VerificationResultConfirmed")
-          .withArgs(otherAccount.address, true);
+          .withArgs(otherAccount.address);
       });
     });
   });

test/scenarios/pool/withdraw-request.test.ts

@@ -53,14 +53,13 @@ describe("Withdraw Requests", () => {
     expect(await pool.maxWithdrawRequest(bobLender.address)).to.equal(63);
 
     // Request a withdraw from Alice for Period n + 1 (in this case, 1)
-    expect(await pool.connect(aliceLender).requestWithdraw(50))
-      .to.emit(pool.address, "WithdrawRequested")
-      .withArgs(aliceLender.address, 50);
+    await expect(pool.connect(aliceLender).requestWithdraw(50))
+      .to.emit(pool, "WithdrawRequested")
+      .withArgs(aliceLender.address, 50, 50);
 
-    // Request a Redeem from Bob for Period n + 1 (in this case, 1)
-    expect(await pool.connect(bobLender).requestRedeem(10))
-      .to.emit(pool.address, "RedeemRequested")
-      .withArgs(bobLender.address, 10);
+    await expect(pool.connect(bobLender).requestRedeem(10))
+      .to.emit(pool, "WithdrawRequested")
+      .withArgs(bobLender.address, 10, 10);
 
     // Ensure a fee was paid (10% of 60 = 6 tokens)
     expect(await pool.totalSupply()).to.equal(164);
@@ -157,7 +156,7 @@ describe("Withdraw Requests", () => {
 
     // Cancel Bob's request
     const bobBalance = await pool.balanceOf(bobLender.address);
-    expect(await pool.connect(bobLender).cancelRedeemRequest(3));
+    await pool.connect(bobLender).cancelRedeemRequest(3);
 
     // Expect a fee to be paid
     expect(await pool.balanceOf(bobLender.address)).to.equal(bobBalance.sub(1));

test/support/verite.ts

@@ -103,7 +103,11 @@ export async function performVeriteVerification(
   await contract.connect(admin).addCredentialSchema(verificationResult.schema);
 
   // Verify the verification result
-  await expect(contract.connect(subject).verify(verificationResult, signature))
+  const txn = await contract
+    .connect(subject)
+    .verify(verificationResult, signature);
+  await expect(txn)
     .to.emit(contract, "VerificationResultConfirmed")
     .withArgs(subject.address);
+  return txn;
 }