Commit f2eaaa83 authored by Maurelian's avatar Maurelian Committed by GitHub

feat: Remove thin wrapper _run() function overload (#13101)

parent 3435fcc1
...@@ -161,7 +161,7 @@ contract Deploy is Deployer { ...@@ -161,7 +161,7 @@ contract Deploy is Deployer {
/// @notice Deploy all of the L1 contracts necessary for a full Superchain with a single Op Chain. /// @notice Deploy all of the L1 contracts necessary for a full Superchain with a single Op Chain.
function run() public { function run() public {
console.log("Deploying a fresh OP Stack including SuperchainConfig"); console.log("Deploying a fresh OP Stack including SuperchainConfig");
_run(); _run({ _needsSuperchain: true });
} }
/// @notice Deploy a new OP Chain using an existing SuperchainConfig and ProtocolVersions /// @notice Deploy a new OP Chain using an existing SuperchainConfig and ProtocolVersions
...@@ -183,27 +183,24 @@ contract Deploy is Deployer { ...@@ -183,27 +183,24 @@ contract Deploy is Deployer {
save("ProtocolVersions", pvProxy.implementation()); save("ProtocolVersions", pvProxy.implementation());
save("ProtocolVersionsProxy", _protocolVersionsProxy); save("ProtocolVersionsProxy", _protocolVersionsProxy);
_run(false); _run({ _needsSuperchain: false });
} }
/// @notice Used for L1 alloc generation.
function runWithStateDump() public { function runWithStateDump() public {
vm.chainId(cfg.l1ChainID()); vm.chainId(cfg.l1ChainID());
_run(); _run({ _needsSuperchain: true });
vm.dumpState(Config.stateDumpPath("")); vm.dumpState(Config.stateDumpPath(""));
} }
/// @notice Deploy all L1 contracts and write the state diff to a file. /// @notice Deploy all L1 contracts and write the state diff to a file.
/// Used to generate kontrol tests.
function runWithStateDiff() public stateDiff { function runWithStateDiff() public stateDiff {
_run(); _run({ _needsSuperchain: true });
}
/// @notice Compatibility function for tests that override _run().
function _run() internal virtual {
_run(true);
} }
/// @notice Internal function containing the deploy logic. /// @notice Internal function containing the deploy logic.
function _run(bool _needsSuperchain) internal { function _run(bool _needsSuperchain) internal virtual {
console.log("start of L1 Deploy!"); console.log("start of L1 Deploy!");
// Set up the Superchain if needed. // Set up the Superchain if needed.
......
...@@ -59,7 +59,7 @@ struct GuardianConfig { ...@@ -59,7 +59,7 @@ struct GuardianConfig {
/// be used as an example to guide the setup and configuration of the Safe contracts. /// be used as an example to guide the setup and configuration of the Safe contracts.
contract DeployOwnership is Deploy { contract DeployOwnership is Deploy {
/// @notice Internal function containing the deploy logic. /// @notice Internal function containing the deploy logic.
function _run() internal override { function _run(bool) internal override {
console.log("start of Ownership Deployment"); console.log("start of Ownership Deployment");
// The SuperchainConfig is needed as a constructor argument to the Deputy Guardian Module // The SuperchainConfig is needed as a constructor argument to the Deputy Guardian Module
deploySuperchainConfig(); deploySuperchainConfig();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment