Merge pull request #2204 from tonykogias/remove-watcher-utils-in-integration-tests

maintenance: deleted watch-utils and added the utilities in env.ts

.changeset/nasty-donkeys-collect.md

+---
+'@eth-optimism/integration-tests': patch
+---
+
+Deletes watcher-utils.ts. Moves it's utilities into env.ts.

integration-tests/test/shared/env.ts

 /* Imports: External */
-import { Contract, utils, Wallet, providers } from 'ethers'
-import { TransactionResponse } from '@ethersproject/providers'
+import { Contract, utils, Wallet, providers, Transaction } from 'ethers'
+import {
+  TransactionResponse,
+  TransactionReceipt,
+} from '@ethersproject/providers'
 import { getContractFactory, predeploys } from '@eth-optimism/contracts'
 import { sleep } from '@eth-optimism/core-utils'
-import { CrossChainMessenger, MessageStatus } from '@eth-optimism/sdk'
+import {
+  CrossChainMessenger,
+  MessageStatus,
+  MessageDirection,
+} from '@eth-optimism/sdk'
 
 /* Imports: Internal */
 import {
@@ -21,10 +28,13 @@ import {
   getL2Bridge,
   envConfig,
 } from './utils'
-import {
-  CrossDomainMessagePair,
-  waitForXDomainTransaction,
-} from './watcher-utils'
+
+export interface CrossDomainMessagePair {
+  tx: Transaction
+  receipt: TransactionReceipt
+  remoteTx: Transaction
+  remoteReceipt: TransactionReceipt
+}
 
 /// Helper class for instantiating a test environment with a funded account
 export class OptimismEnv {
@@ -168,7 +178,32 @@ export class OptimismEnv {
   async waitForXDomainTransaction(
     tx: Promise<TransactionResponse> | TransactionResponse
   ): Promise<CrossDomainMessagePair> {
-    return waitForXDomainTransaction(this.messenger, tx)
+    // await it if needed
+    tx = await tx
+
+    const receipt = await tx.wait()
+    const resolved = await this.messenger.toCrossChainMessage(tx)
+    const messageReceipt = await this.messenger.waitForMessageReceipt(tx)
+    let fullTx: any
+    let remoteTx: any
+    if (resolved.direction === MessageDirection.L1_TO_L2) {
+      fullTx = await this.messenger.l1Provider.getTransaction(tx.hash)
+      remoteTx = await this.messenger.l2Provider.getTransaction(
+        messageReceipt.transactionReceipt.transactionHash
+      )
+    } else {
+      fullTx = await this.messenger.l2Provider.getTransaction(tx.hash)
+      remoteTx = await this.messenger.l1Provider.getTransaction(
+        messageReceipt.transactionReceipt.transactionHash
+      )
+    }
+
+    return {
+      tx: fullTx,
+      receipt,
+      remoteTx,
+      remoteReceipt: messageReceipt.transactionReceipt,
+    }
   }
 
   /**

integration-tests/test/shared/watcher-utils.ts

-import {
-  TransactionReceipt,
-  TransactionResponse,
-} from '@ethersproject/providers'
-import { Transaction } from 'ethers'
-import { CrossChainMessenger, MessageDirection } from '@eth-optimism/sdk'
-
-export interface CrossDomainMessagePair {
-  tx: Transaction
-  receipt: TransactionReceipt
-  remoteTx: Transaction
-  remoteReceipt: TransactionReceipt
-}
-
-export enum Direction {
-  L1ToL2,
-  L2ToL1,
-}
-
-export const waitForXDomainTransaction = async (
-  messenger: CrossChainMessenger,
-  tx: Promise<TransactionResponse> | TransactionResponse
-): Promise<CrossDomainMessagePair> => {
-  // await it if needed
-  tx = await tx
-
-  const receipt = await tx.wait()
-  const resolved = await messenger.toCrossChainMessage(tx)
-  const messageReceipt = await messenger.waitForMessageReceipt(tx)
-  let fullTx: any
-  let remoteTx: any
-  if (resolved.direction === MessageDirection.L1_TO_L2) {
-    fullTx = await messenger.l1Provider.getTransaction(tx.hash)
-    remoteTx = await messenger.l2Provider.getTransaction(
-      messageReceipt.transactionReceipt.transactionHash
-    )
-  } else {
-    fullTx = await messenger.l2Provider.getTransaction(tx.hash)
-    remoteTx = await messenger.l1Provider.getTransaction(
-      messageReceipt.transactionReceipt.transactionHash
-    )
-  }
-
-  return {
-    tx: fullTx,
-    receipt,
-    remoteTx,
-    remoteReceipt: messageReceipt.transactionReceipt,
-  }
-}