Merge pull request #4247 from ethereum-optimism/jm/ctb-test-cleanup/5

Rename CrossDomainOwnable, L1Block and L1BlockNumber tests

packages/contracts-bedrock/.gas-snapshot

@@ -9,13 +9,13 @@ GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88513)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 74953)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36044)
 CrossDomainMessenger_BaseGas_Test:test_baseGas_succeeds() (gas: 20098)
-CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner() (gas: 61806)
-CrossDomainOwnable_Test:test_onlyOwner() (gas: 34861)
-CrossDomainOwnable_Test:test_revertOnlyOwner() (gas: 10530)
-CrossDomainOwnable2_Test:test_onlyOwner() (gas: 77782)
-CrossDomainOwnable2_Test:test_revertNotSetOnlyOwner() (gas: 8461)
-CrossDomainOwnable2_Test:test_revertNotSetOnlyOwner2() (gas: 14565)
-CrossDomainOwnable2_Test:test_revertOnlyOwner() (gas: 61712)
+CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 61806)
+CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10530)
+CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34861)
+CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8416)
+CrossDomainOwnable2_Test:test_onlyOwner_notOwner2_reverts() (gas: 61733)
+CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16588)
+CrossDomainOwnable2_Test:test_onlyOwner_succeeds() (gas: 77782)
 DeployerWhitelist_Test:test_owner() (gas: 7516)
 DeployerWhitelist_Test:test_storageSlots() (gas: 33395)
 FeeVault_Test:test_constructor_succeeds() (gas: 10601)
@@ -28,16 +28,15 @@ GasPriceOracle_Test:test_scalar_succeeds() (gas: 10611)
 GasPriceOracle_Test:test_setGasPrice_doesNotExist_reverts() (gas: 5910)
 GasPriceOracle_Test:test_setL1BaseFee_doesNotExist_reverts() (gas: 5910)
 Hashing_Test:test_hashDepositSource_succeeds() (gas: 650)
-L1BlockTest:test_basefee() (gas: 7531)
-L1BlockTest:test_hash() (gas: 7553)
-L1BlockTest:test_number() (gas: 7608)
-L1BlockTest:test_sequenceNumber() (gas: 7673)
-L1BlockTest:test_timestamp() (gas: 7594)
-L1BlockTest:test_updateValues() (gas: 60459)
-L1BlockTest:test_updatesValues(uint64,uint64,uint256,bytes32,uint64,bytes32,uint256,uint256) (runs: 256, μ: 69416, ~: 70615)
-L1BlockNumberTest:test_fallback() (gas: 18611)
-L1BlockNumberTest:test_getL1BlockNumber() (gas: 10602)
-L1BlockNumberTest:test_receive() (gas: 25341)
+L1BlockTest:test_basefee_succeeds() (gas: 7553)
+L1BlockTest:test_hash_succeeds() (gas: 7510)
+L1BlockTest:test_number_succeeds() (gas: 7584)
+L1BlockTest:test_sequenceNumber_succeeds() (gas: 7630)
+L1BlockTest:test_timestamp_succeeds() (gas: 7595)
+L1BlockTest:test_updateValues_succeeds() (gas: 60481)
+L1BlockNumberTest:test_fallback_succeeds() (gas: 18633)
+L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10603)
+L1BlockNumberTest:test_receive_succeeds() (gas: 25340)
 L1CrossDomainMessenger_Test:testCannot_L1MessengerPause() (gas: 24538)
 L1CrossDomainMessenger_Test:testCannot_L1MessengerUnpause() (gas: 24496)
 L1CrossDomainMessenger_Test:test_L1MessengerMessageVersion() (gas: 24715)

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

@@ -23,13 +23,13 @@ contract CrossDomainOwnable_Test is CommonTest {
     }
 
     // Check that the revert message is correct
-    function test_revertOnlyOwner() external {
+    function test_onlyOwner_notOwner_reverts() external {
         vm.expectRevert("CrossDomainOwnable: caller is not the owner");
         setter.set(1);
     }
 
     // Check that making a call can set the value properly
-    function test_onlyOwner() external {
+    function test_onlyOwner_succeeds() external {
         assertEq(setter.value(), 0);
 
         vm.prank(AddressAliasHelper.applyL1ToL2Alias(setter.owner()));
@@ -48,7 +48,7 @@ contract CrossDomainOwnableThroughPortal_Test is Portal_Initializer {
         setter = new XDomainSetter();
     }
 
-    function test_depositTransaction_crossDomainOwner() external {
+    function test_depositTransaction_crossDomainOwner_succeeds() external {
         vm.recordLogs();
 
         vm.prank(alice);

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

@@ -25,15 +25,15 @@ contract CrossDomainOwnable2_Test is Messenger_Initializer {
         setter = new XDomainSetter2();
     }
 
-    function test_revertNotSetOnlyOwner() external {
+    function test_onlyOwner_notMessenger_reverts() external {
         vm.expectRevert("CrossDomainOwnable2: caller is not the messenger");
         setter.set(1);
     }
 
-    function test_revertNotSetOnlyOwner2() external {
-        // set the xdomain messenger storage slot
+    function test_onlyOwner_notOwner_reverts() external {
+        // set the xDomainMsgSender storage slot
         bytes32 key = bytes32(uint256(204));
-        bytes32 value = Bytes32AddressLib.fillLast12Bytes(address(setter));
+        bytes32 value = Bytes32AddressLib.fillLast12Bytes(address(alice));
         vm.store(address(L2Messenger), key, value);
 
         vm.prank(address(L2Messenger));
@@ -41,7 +41,8 @@ contract CrossDomainOwnable2_Test is Messenger_Initializer {
         setter.set(1);
     }
 
-    function test_revertOnlyOwner() external {
+
+    function test_onlyOwner_notOwner2_reverts() external {
         uint240 nonce = 0;
         address sender = bob;
         address target = address(setter);
@@ -76,7 +77,7 @@ contract CrossDomainOwnable2_Test is Messenger_Initializer {
         assertEq(setter.value(), 0);
     }
 
-    function test_onlyOwner() external {
+    function test_onlyOwner_succeeds() external {
         address owner = setter.owner();
 
         // Simulate the L2 execution where the call is coming from

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

@@ -25,7 +25,7 @@ contract L1BlockTest is CommonTest {
         });
     }
 
-    function test_updatesValues(
+    function testFuzz_updatesValues_succeeds(
         uint64 n,
         uint64 t,
         uint256 b,
@@ -47,27 +47,27 @@ contract L1BlockTest is CommonTest {
         assertEq(lb.l1FeeScalar(), fs);
     }
 
-    function test_number() external {
+    function test_number_succeeds() external {
         assertEq(lb.number(), uint64(1));
     }
 
-    function test_timestamp() external {
+    function test_timestamp_succeeds() external {
         assertEq(lb.timestamp(), uint64(2));
     }
 
-    function test_basefee() external {
+    function test_basefee_succeeds() external {
         assertEq(lb.basefee(), 3);
     }
 
-    function test_hash() external {
+    function test_hash_succeeds() external {
         assertEq(lb.hash(), NON_ZERO_HASH);
     }
 
-    function test_sequenceNumber() external {
+    function test_sequenceNumber_succeeds() external {
         assertEq(lb.sequenceNumber(), uint64(4));
     }
 
-    function test_updateValues() external {
+    function test_updateValues_succeeds() external {
         vm.prank(depositor);
         lb.setL1BlockValues({
             _number: type(uint64).max,

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

@@ -30,17 +30,17 @@ contract L1BlockNumberTest is Test {
         });
     }
 
-    function test_getL1BlockNumber() external {
+    function test_getL1BlockNumber_succeeds() external {
         assertEq(bn.getL1BlockNumber(), number);
     }
 
-    function test_fallback() external {
+    function test_fallback_succeeds() external {
         (bool success, bytes memory ret) = address(bn).call(hex"");
         assertEq(success, true);
         assertEq(ret, abi.encode(number));
     }
 
-    function test_receive() external {
+    function test_receive_succeeds() external {
         (bool success, bytes memory ret) = address(bn).call{ value: 1 }(hex"");
         assertEq(success, true);
         assertEq(ret, abi.encode(number));