From 6e642048ec1f6004267eb95c1601cc1351db138f Mon Sep 17 00:00:00 2001
From: niha <205694301+0xniha@users.noreply.github.com>
Date: Thu, 25 Sep 2025 18:59:40 -0300
Subject: [PATCH] refactor: use skipIfDevFeatureDisabled for cgt predeploys
 test (#614)

---
 .../test/libraries/Predeploys.t.sol           | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/contracts-bedrock/test/libraries/Predeploys.t.sol b/packages/contracts-bedrock/test/libraries/Predeploys.t.sol
index e4ba647172b01..cd6ca72fd7efb 100644
--- a/packages/contracts-bedrock/test/libraries/Predeploys.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Predeploys.t.sol
@@ -143,6 +143,13 @@ contract Predeploys_Unclassified_Test is Predeploys_TestInit {
     function test_predeploys_succeeds() external {
         _test_predeploys(Fork.ISTHMUS, false, false);
     }
+
+    /// @notice Tests that the predeploy addresses are set correctly. They have code
+    ///         and the proxied accounts have the correct admin. Using custom gas token.
+    function test_predeploys_customGasToken_succeeds() external {
+        skipIfDevFeatureDisabled(DevFeatures.CUSTOM_GAS_TOKEN);
+        _test_predeploys(Fork.ISTHMUS, false, true);
+    }
 }
 
 /// @title Predeploys_Interop_Unclassified_Test
@@ -167,19 +174,3 @@ contract Predeploys_UnclassifiedInterop_Test is Predeploys_TestInit {
         _test_predeploys(Fork.INTEROP, false, false);
     }
 }
-
-/// @title Predeploys_CustomGasToken_Test
-/// @notice Tests the `Predeploys` contract with custom gas token.
-contract Predeploys_CustomGasToken_Test is Predeploys_TestInit {
-    /// @notice Test setup. Enabling custom gas token.
-    function setUp() public virtual override {
-        super.setUp();
-        skipIfDevFeatureDisabled(DevFeatures.CUSTOM_GAS_TOKEN);
-    }
-
-    /// @notice Tests that the predeploy addresses are set correctly. They have code and the
-    ///         proxied accounts have the correct admin. Using custom gas token.
-    function test_predeploysWithCustomGasToken_succeeds() external {
-        _test_predeploys(Fork.ISTHMUS, false, true);
-    }
-}