integration-tests: Override the default bridge adapters (#2574)

* integration-tests: Override the default bridge adapters

* Fix non-actor integration tests in CI
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

.changeset/giant-eels-fold.md

+---
+'@eth-optimism/integration-tests': patch
+---
+
+integration-tests: Override default bridge adapters

integration-tests/actor-tests/deposits.test.ts

@@ -37,9 +37,9 @@ actor('Funds depositor', () => {
     const balBefore = await l2Wallet.getBalance()
     await b.bench('deposit', async () => {
       await env.waitForXDomainTransaction(
-        env.messenger.contracts.l1.L1StandardBridge
-          .connect(l1Wallet)
-          .depositETH(DEFAULT_TEST_GAS_L2, '0xFFFF', {
+        env.messenger.contracts.l1.L1StandardBridge.connect(
+          l1Wallet
+        ).depositETH(DEFAULT_TEST_GAS_L2, '0xFFFF', {
           value: 0x42,
           gasLimit: DEFAULT_TEST_GAS_L1,
         })
@@ -47,8 +47,8 @@ actor('Funds depositor', () => {
     })
     // Converting BigNumber to hex string prevents chai from incorrectly considering inherited properties
     // for strict equality - https://github.com/chaijs/chai/issues/948
-    expect((await l2Wallet.getBalance()).sub(balBefore).toString()).to.deep.equal(
-      BigNumber.from(0x42).toString()
-    )
+    expect(
+      (await l2Wallet.getBalance()).sub(balBefore).toString()
+    ).to.deep.equal(BigNumber.from(0x42).toString())
   })
 })

integration-tests/test/shared/env.ts

@@ -9,7 +9,11 @@ import {
   CrossChainMessenger,
   MessageStatus,
   MessageDirection,
+  StandardBridgeAdapter,
+  ETHBridgeAdapter,
+  BridgeAdapterData,
 } from '@eth-optimism/sdk'
+import { predeploys } from '@eth-optimism/contracts'
 
 /* Imports: Internal */
 import {
@@ -56,6 +60,22 @@ export class OptimismEnv {
   static async new(): Promise<OptimismEnv> {
     const network = await l1Provider.getNetwork()
 
+    let bridgeOverrides: BridgeAdapterData
+    if (envConfig.L1_STANDARD_BRIDGE) {
+      bridgeOverrides = {
+        Standard: {
+          Adapter: StandardBridgeAdapter,
+          l1Bridge: envConfig.L1_STANDARD_BRIDGE,
+          l2Bridge: predeploys.L2StandardBridge,
+        },
+        ETH: {
+          Adapter: ETHBridgeAdapter,
+          l1Bridge: envConfig.L1_STANDARD_BRIDGE,
+          l2Bridge: predeploys.L2StandardBridge,
+        },
+      }
+    }
+
     const messenger = new CrossChainMessenger({
       l1SignerOrProvider: l1Wallet,
       l2SignerOrProvider: l2Wallet,
@@ -68,8 +88,9 @@ export class OptimismEnv {
           StateCommitmentChain: envConfig.STATE_COMMITMENT_CHAIN,
           CanonicalTransactionChain: envConfig.CANONICAL_TRANSACTION_CHAIN,
           BondManager: envConfig.BOND_MANAGER,
-        }
-      }
+        },
+      },
+      bridges: bridgeOverrides,
     })
 
     // fund the user if needed

integration-tests/test/shared/utils.ts

@@ -32,9 +32,13 @@ const gasPriceValidator = makeValidator((gasPrice) => {
 })
 
 const addressValidator = makeValidator((addr) => {
-  if (!addr) { return '' }
-  else if (utils.isAddress(addr)) { return addr }
-  else { throw new Error('Expected an address') }
+  if (!addr) {
+    return ''
+  } else if (utils.isAddress(addr)) {
+    return addr
+  } else {
+    throw new Error('Expected an address')
+  }
 })
 
 const procEnv = cleanEnv(process.env, {