Fix tests error handling (avoid TX_OVERRIDES_BUG)

Author: krebernisak

src/optimism/index.ts

@@ -1,6 +1 @@
 export * from '@chainlink/optimism-utils'
-
-// TODO: Fix ERROR { "reason":"cannot estimate gas; transaction may fail or may require manual gas limit","code":"UNPREDICTABLE_GAS_LIMIT" }
-export const TX_OVERRIDES_BUG: any = {
-  gasLimit: 8_999_999,
-}

test/helpers/index.ts

@@ -43,10 +43,7 @@ export const functionID = (fnSignature: string) => {
  * @param contract The contract with the actual abi to check the expected exposed methods and getters against.
  * @param expectedPublic The expected public exposed methods and getters to match against the actual abi.
  */
-export function publicAbi(
-  contract: ethers.Contract | ethers.ContractFactory,
-  expectedPublic: string[],
-) {
+export function publicAbi(contract: ethers.Contract | ethers.ContractFactory, expectedPublic: string[]) {
   const actualPublic = []
   for (const method of contract.interface.fragments) {
     if (method.type === 'function') {
@@ -64,34 +61,3 @@ export function publicAbi(
     assert.isAtLeast(index, 0, `#${method} is expected to be public`)
   }
 }
-
-/**
- * Check that an evm transaction fails
- *
- * @param action The asynchronous action to execute, which should cause an evm revert.
- */
-export async function txRevert(action: (() => Promise<any>) | Promise<any>) {
-  try {
-    if (typeof action === 'function') {
-      await action()
-    } else {
-      await action
-    }
-  } catch (e) {
-    assert(e.message, 'Expected an error to contain a message')
-
-    const ERROR_MESSAGES = ['transaction failed']
-    const hasErrored = ERROR_MESSAGES.some((msg) => e.message.includes(msg))
-
-    assert(
-      hasErrored,
-      `expected following error message to include ${ERROR_MESSAGES.join(' or ')}. Got: "${
-        e.message
-      }"`,
-    )
-    return
-  }
-
-  const err = undefined
-  assert.exists(err, 'Expected an error to be raised')
-}

test/v0.7/bridge/token/LinkTokenChild.test.ts

@@ -188,10 +188,8 @@ describe(`LinkTokenChild ${Versions.v0_7}`, () => {
     })
 
     it('can NOT mint without access (gateway role)', async () => {
-      const mintTx = await l2Token.mint(oe.l2Wallet.address, 100, optimism.TX_OVERRIDES_BUG)
-      // TODO: fetch revert reason
-      // revert: 'No access'
-      await h.txRevert(mintTx.wait())
+      const mintTx = l2Token.mint(oe.l2Wallet.address, 100)
+      await expect(mintTx).to.be.revertedWith('No access')
     })
 
     it('owner can migrate to a new gateway', async () => {
@@ -201,7 +199,7 @@ describe(`LinkTokenChild ${Versions.v0_7}`, () => {
       const addAccessTx1 = await l2Token.addAccess(owner.address)
       await addAccessTx1.wait()
       // Mint some tokens as owner/gateway
-      const mintTx1 = await l2Token.mint(owner.address, 100, optimism.TX_OVERRIDES_BUG)
+      const mintTx1 = await l2Token.mint(owner.address, 100)
       await mintTx1.wait()
       // Assert state
       expect(await l2Token.balanceOf(owner.address)).to.be.equal(100)
@@ -219,10 +217,8 @@ describe(`LinkTokenChild ${Versions.v0_7}`, () => {
       const removeAccessTx = await l2Token.removeAccess(owner.address)
       await removeAccessTx.wait()
       // Owner mint fails
-      const mintTx = await l2Token.mint(owner.address, 100, optimism.TX_OVERRIDES_BUG)
-      // TODO: fetch revert reason
-      // revert: 'No access'
-      await h.txRevert(mintTx.wait())
+      const mintTx = l2Token.mint(owner.address, 100)
+      await expect(mintTx).to.be.revertedWith('No access')
     })
   })
 })