From d5a6ffeb988dd2f4d0735dfc077314512b7d294a Mon Sep 17 00:00:00 2001
From: Diego <105765223+0xfuturistic@users.noreply.github.com>
Date: Thu, 14 Mar 2024 17:04:44 -0700
Subject: [PATCH] contracts-bedrock: use Test instead of CommonTest with
 CrossL2Inbox.t.sol

---
 .../contracts-bedrock/test/L2/CrossL2Inbox.t.sol | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index a175525217a9..4c0dd94a2262 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -2,17 +2,15 @@
 pragma solidity 0.8.24;
 
 // Testing utilities
-import { CommonTest } from "test/setup/CommonTest.sol";
+import { Test } from "forge-std/Test.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 import { Reverter, ConfigurableCaller } from "test/mocks/Callers.sol";
-import { ICrossL2Inbox } from "src/L2/ICrossL2Inbox.sol";
-
-// Libraries
-import { SafeCall } from "src/libraries/SafeCall.sol";
 
 import { L1Block } from "src/L2/L1Block.sol";
+import { CrossL2Inbox } from "src/L2/CrossL2Inbox.sol";
+import { ICrossL2Inbox } from "src/L2/ICrossL2Inbox.sol";
 
-contract CrossL2InboxTest is CommonTest {
+contract CrossL2InboxTest is Test {
     ICrossL2Inbox.Identifier sampleId = ICrossL2Inbox.Identifier({
         origin: address(0),
         blocknumber: 0,
@@ -25,6 +23,12 @@ contract CrossL2InboxTest is CommonTest {
 
     bytes sampleMsg = hex"1234";
 
+    ICrossL2Inbox crossL2Inbox;
+
+    function setUp() public {
+        crossL2Inbox = ICrossL2Inbox(new CrossL2Inbox());
+    }
+
     function testFuzz_executeMessage_succeeds(
         bytes calldata _msg,
         ICrossL2Inbox.Identifier calldata _id,