contracts-bedrock: Update tests for minimal Superchain

packages/contracts-bedrock/src/L1/SuperchainConfig.sol

@@ -73,7 +73,8 @@ contract SuperchainConfig is Initializable, ISemver {
         emit Unpaused();
     }
 
-    /// @notice Sets the guardian address.
+    /// @notice Sets the guardian address. This is only callable during initialization, so an upgrade
+    ///         will be required to change the guardian.
     /// @param _guardian The new guardian address.
     function _setGuardian(address _guardian) internal {
         Storage.setAddress(GUARDIAN_SLOT, _guardian);

packages/contracts-bedrock/test/Initializable.t.sol

@@ -35,6 +35,14 @@ contract Initializer_Test is Bridge_Initializer {
         // Initialize the `contracts` array with the addresses of the contracts to test, the
         // calldata used to initialize them, and the storage slot of their `_initialized` flag.
 
+        // SuperchainConfig
+        contracts.push(
+            InitializeableContract({
+                target: address(superchainConfig),
+                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0))),
+                initializedSlotVal: loadInitializedSlot("SuperchainConfig", true)
+            })
+        );
         // L1CrossDomainMessenger
         contracts.push(
             InitializeableContract({

packages/contracts-bedrock/test/SuperchainConfig.t.sol

@@ -17,7 +17,7 @@ contract SuperchainConfig_Init_Test is CommonTest {
     /// @dev Tests that initialization sets the correct values. These are defined in CommonTest.sol.
     function test_initialize_values_succeeds() external {
         assertFalse(superchainConfig.paused());
-        assertEq(superchainConfig.guardian(), guardian);
+        assertEq(superchainConfig.guardian(), cfg.portalGuardian());
     }
 }
 
@@ -44,7 +44,7 @@ contract SuperchainConfig_Pause_Test is CommonTest {
         vm.expectEmit(address(superchainConfig));
         emit Paused("identifier");
 
-        vm.prank(guardian);
+        vm.prank(cfg.portalGuardian());
         superchainConfig.pause("identifier");
 
         assertTrue(superchainConfig.paused());
@@ -54,7 +54,9 @@ contract SuperchainConfig_Pause_Test is CommonTest {
 contract SuperchainConfig_Unpause_TestFail is CommonTest {
     /// @dev Tests that `unpause` reverts when called by a non-guardian.
     function test_unpause_notGuardian_reverts() external {
-        _pause();
+        vm.prank(cfg.portalGuardian());
+        superchainConfig.pause("identifier");
+        assertEq(superchainConfig.paused(), true);
 
         assertTrue(superchainConfig.guardian() != alice);
         vm.expectRevert("SuperchainConfig: only guardian can unpause");
@@ -69,11 +71,13 @@ contract SuperchainConfig_Unpause_Test is CommonTest {
     /// @dev Tests that `unpause` successfully unpauses
     ///      when called by the guardian.
     function test_unpause_succeeds() external {
-        _pause();
+        vm.prank(cfg.portalGuardian());
+        superchainConfig.pause("identifier");
+        assertEq(superchainConfig.paused(), true);
 
         vm.expectEmit(address(superchainConfig));
         emit Unpaused();
-        vm.prank(guardian);
+        vm.prank(cfg.portalGuardian());
         superchainConfig.unpause();
 
         assertFalse(superchainConfig.paused());

packages/contracts-bedrock/test/setup/Events.sol

@@ -94,4 +94,8 @@ contract Events {
         uint256 amount,
         bytes data
     );
+
+    event Paused(string identifier);
+
+    event Unpaused();
 }

packages/contracts-bedrock/test/setup/Setup.sol

@@ -30,6 +30,7 @@ import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Executables } from "scripts/Executables.sol";
 import { Vm } from "forge-std/Vm.sol";
+import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
 
 /// @title Setup
 /// @dev This contact is responsible for setting up the contracts in state. It currently
@@ -50,6 +51,7 @@ contract Setup {
     L1ERC721Bridge l1ERC721Bridge;
     OptimismMintableERC20Factory l1OptimismMintableERC20Factory;
     ProtocolVersions protocolVersions;
+    SuperchainConfig superchainConfig;
 
     L2CrossDomainMessenger l2CrossDomainMessenger =
         L2CrossDomainMessenger(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER));
@@ -106,6 +108,7 @@ contract Setup {
         l1OptimismMintableERC20Factory =
             OptimismMintableERC20Factory(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
         protocolVersions = ProtocolVersions(deploy.mustGetAddress("ProtocolVersionsProxy"));
+        superchainConfig = SuperchainConfig(deploy.mustGetAddress("SuperchainConfigProxy"));
 
         vm.label(address(l2OutputOracle), "L2OutputOracle");
         vm.label(deploy.mustGetAddress("L2OutputOracleProxy"), "L2OutputOracleProxy");
@@ -124,6 +127,8 @@ contract Setup {
         vm.label(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"), "OptimismMintableERC20FactoryProxy");
         vm.label(address(protocolVersions), "ProtocolVersions");
         vm.label(deploy.mustGetAddress("ProtocolVersionsProxy"), "ProtocolVersionsProxy");
+        vm.label(address(superchainConfig), "SuperchainConfig");
+        vm.label(deploy.mustGetAddress("SuperchainConfigProxy"), "SuperchainConfigProxy");
         vm.label(AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger)), "L1CrossDomainMessenger_aliased");
     }