Mark's nits

packages/contracts-bedrock/.gas-snapshot

@@ -150,7 +150,7 @@ L2OutputOracleTest:test_constructor_badTimestamp_reverts() (gas: 70950)
 L2OutputOracleTest:test_constructor_l2BlockTimeZero_reverts() (gas: 45957)
 L2OutputOracleTest:test_constructor_succeeds() (gas: 33827)
 L2OutputOracleTest:test_deleteL2Outputs_afterLatest_reverts() (gas: 212262)
-L2OutputOracleTest:test_deleteL2Outputs_finalized_reverts() (gas: 107744)
+L2OutputOracleTest:test_deleteL2Outputs_finalized_reverts() (gas: 108967)
 L2OutputOracleTest:test_deleteL2Outputs_ifNotChallenger_reverts() (gas: 18918)
 L2OutputOracleTest:test_deleteL2Outputs_nonExistent_reverts() (gas: 107339)
 L2OutputOracleTest:test_deleteOutputs_multipleOutputs_succeeds() (gas: 302439)

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

@@ -128,15 +128,15 @@ contract L2OutputOracle_Initializer is CommonTest {
         vm.warp(initL1Time);
         vm.roll(startingBlockNumber);
         // Deploy the L2OutputOracle and transfer owernship to the proposer
-        oracleImpl = new L2OutputOracle(
-            submissionInterval,
-            l2BlockTime,
-            startingBlockNumber,
-            startingTimestamp,
-            proposer,
-            owner,
-            7 days // finalization period (seconds)
-        );
+        oracleImpl = new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: startingTimestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
         Proxy proxy = new Proxy(multisig);
         vm.prank(multisig);
         proxy.upgradeToAndCall(

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

@@ -22,29 +22,29 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
     function test_constructor_badTimestamp_reverts() external {
         vm.expectRevert("L2OutputOracle: starting L2 timestamp must be less than current time");
 
-        new L2OutputOracle(
-            submissionInterval,
-            l2BlockTime,
-            startingBlockNumber,
+        new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
             // startingTimestamp is in the future
-            block.timestamp + 1,
-            proposer,
-            owner,
-            7 days // finalization period (seconds)
-        );
+            _startingTimestamp: block.timestamp + 1,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     function test_constructor_l2BlockTimeZero_reverts() external {
         vm.expectRevert("L2OutputOracle: L2 block time must be greater than 0");
-        new L2OutputOracle(
-            submissionInterval,
-            0,
-            startingBlockNumber,
-            block.timestamp,
-            proposer,
-            owner,
-            7 days // finalization period (seconds)
-        );
+        new L2OutputOracle({
+            _submissionInterval: submissionInterval,
+            _l2BlockTime: 0,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: block.timestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     function testFuzz_constructor_submissionIntervalLteL2BlockTime_reverts(
@@ -59,15 +59,15 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
         _submissionInterval = bound(_submissionInterval, 0, _l2BlockTime);
 
         vm.expectRevert("L2OutputOracle: submission interval must be greater than L2 block time");
-        new L2OutputOracle(
-            _submissionInterval,
-            _l2BlockTime,
-            startingBlockNumber,
-            block.timestamp,
-            proposer,
-            owner,
-            7 days // finalization period (seconds)
-        );
+        new L2OutputOracle({
+            _submissionInterval: _submissionInterval,
+            _l2BlockTime: _l2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: block.timestamp,
+            _proposer: proposer,
+            _challenger: owner,
+            _finalizationPeriodSeconds: 7 days
+        });
     }
 
     /****************
@@ -419,7 +419,7 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
         test_proposeL2Output_proposeAnotherOutput_succeeds();
 
         // Warp past the finalization period + 1 second
-        vm.warp(block.timestamp + 7 days + 1);
+        vm.warp(block.timestamp + oracle.FINALIZATION_PERIOD_SECONDS() + 1);
 
         uint256 latestOutputIndex = oracle.latestOutputIndex();