From d97df13a7cb64b15cdb9c92ef7765be27c2106fb Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu, 28 Jul 2022 16:10:12 -0700
Subject: [PATCH] integration-tests: modularize

Move away from using a nested api on the messenger
and instead use an imported function
---
 .changeset/wet-doors-collect.md                | 5 +++++
 integration-tests/test/queue-ingestion.spec.ts | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/wet-doors-collect.md

diff --git a/.changeset/wet-doors-collect.md b/.changeset/wet-doors-collect.md
new file mode 100644
index 0000000000000..e1f54d4b0d3e0
--- /dev/null
+++ b/.changeset/wet-doors-collect.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/integration-tests': patch
+---
+
+Modularize the itests away from depending on api of messenger
diff --git a/integration-tests/test/queue-ingestion.spec.ts b/integration-tests/test/queue-ingestion.spec.ts
index 8011558c45d67..c3170dc7d6431 100644
--- a/integration-tests/test/queue-ingestion.spec.ts
+++ b/integration-tests/test/queue-ingestion.spec.ts
@@ -2,6 +2,7 @@
 import { providers } from 'ethers'
 import { applyL1ToL2Alias } from '@eth-optimism/core-utils'
 import { asL2Provider } from '@eth-optimism/sdk'
+import { getContractInterface } from '@eth-optimism/contracts'
 
 /* Imports: External */
 import { expect } from './shared/setup'
@@ -47,11 +48,9 @@ describe('Queue Ingestion', () => {
         receipt.remoteTx.hash
       )) as any
 
-      const params =
-        env.messenger.contracts.l2.L2CrossDomainMessenger.interface.decodeFunctionData(
-          'relayMessage',
-          l2Tx.data
-        )
+      const params = getContractInterface(
+        'L2CrossDomainMessenger'
+      ).decodeFunctionData('relayMessage', l2Tx.data)
 
       expect(params._sender.toLowerCase()).to.equal(
         env.l1Wallet.address.toLowerCase()