contracts-bedrock: Update tests for minimal Superchain

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

@@ -54,7 +54,7 @@ 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 {
-        vm.prank(deploy.cfg().portalGuardian());
+        vm.prank(superchainConfig.guardian());
         superchainConfig.pause("identifier");
         assertEq(superchainConfig.paused(), true);
 
@@ -71,13 +71,12 @@ contract SuperchainConfig_Unpause_Test is CommonTest {
     /// @dev Tests that `unpause` successfully unpauses
     ///      when called by the guardian.
     function test_unpause_succeeds() external {
-        vm.prank(deploy.cfg().portalGuardian());
+        vm.startPrank(superchainConfig.guardian());
         superchainConfig.pause("identifier");
         assertEq(superchainConfig.paused(), true);
 
         vm.expectEmit(address(superchainConfig));
         emit Unpaused();
-        vm.prank(deploy.cfg().portalGuardian());
         superchainConfig.unpause();
 
         assertFalse(superchainConfig.paused());

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

@@ -29,7 +29,10 @@ import { AddressManager } from "src/legacy/AddressManager.sol";
 import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Executables } from "scripts/Executables.sol";
+<<<<<<< HEAD
 import { Vm } from "forge-std/Vm.sol";
+=======
+>>>>>>> 98cae7091 (contracts-bedrock: Update tests for minimal Superchain)
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
 
 /// @title Setup
@@ -106,9 +109,15 @@ contract Setup {
         addressManager = AddressManager(deploy.mustGetAddress("AddressManager"));
         l1ERC721Bridge = L1ERC721Bridge(deploy.mustGetAddress("L1ERC721BridgeProxy"));
         l1OptimismMintableERC20Factory =
+<<<<<<< HEAD
             OptimismMintableERC20Factory(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
         protocolVersions = ProtocolVersions(deploy.mustGetAddress("ProtocolVersionsProxy"));
         superchainConfig = SuperchainConfig(deploy.mustGetAddress("SuperchainConfigProxy"));
+=======
+            OptimismMintableERC20Factory(mustGetAddress("OptimismMintableERC20FactoryProxy"));
+        protocolVersions = ProtocolVersions(mustGetAddress("ProtocolVersionsProxy"));
+        superchainConfig = SuperchainConfig(mustGetAddress("SuperchainConfigProxy"));
+>>>>>>> 98cae7091 (contracts-bedrock: Update tests for minimal Superchain)
 
         vm.label(address(l2OutputOracle), "L2OutputOracle");
         vm.label(deploy.mustGetAddress("L2OutputOracleProxy"), "L2OutputOracleProxy");