Merge pull request #4250 from ethereum-optimism/jm/ctb-test-cleanup/8

Rename SequencerFeeVault, Semver, LegacyMessagePasser, ResourceMetering tests

packages/contracts-bedrock/.gas-snapshot

@@ -131,7 +131,7 @@ LegacyERC20ETH_Test:test_metadata_succeeds() (gas: 15414)
 LegacyERC20ETH_Test:test_mint_doesNotExist_reverts() (gas: 10649)
 LegacyERC20ETH_Test:test_transferFrom_doesNotExist_reverts() (gas: 12887)
 LegacyERC20ETH_Test:test_transfer_doesNotExist_reverts() (gas: 10733)
-LegacyMessagePasser_Test:test_LegacyMessagePasser_passMessageToL1_Succeeds() (gas: 34519)
+LegacyMessagePasser_Test:test_passMessageToL1_succeeds() (gas: 34518)
 OptimismMintableERC20_Test:test_bridge_succeeds() (gas: 7643)
 OptimismMintableERC20_Test:test_burn_notBridge_reverts() (gas: 11165)
 OptimismMintableERC20_Test:test_burn_succeeds() (gas: 51013)
@@ -275,18 +275,18 @@ RLPWriter_Test:test_writeUint_smallint3_succeeds() (gas: 7311)
 RLPWriter_Test:test_writeUint_smallint4_succeeds() (gas: 7312)
 RLPWriter_Test:test_writeUint_smallint_succeeds() (gas: 7290)
 RLPWriter_Test:test_writeUint_zero_succeeds() (gas: 7802)
-ResourceMetering_Test:test_initialResourceParams() (gas: 8987)
-ResourceMetering_Test:test_updateNoGasDelta() (gas: 2008125)
-ResourceMetering_Test:test_updateOneEmptyBlock() (gas: 18151)
-ResourceMetering_Test:test_updateParamsNoChange() (gas: 13867)
-ResourceMetering_Test:test_updateTenEmptyBlocks() (gas: 20899)
-ResourceMetering_Test:test_updateTwoEmptyBlocks() (gas: 20945)
-ResourceMetering_Test:test_useMaxSucceeds() (gas: 8017170)
-ResourceMetering_Test:test_useMoreThanMaxReverts() (gas: 16045)
-Semver_Test:test_behindProxy() (gas: 506748)
-Semver_Test:test_version() (gas: 9373)
-SequencerFeeVault_Test:test_constructor() (gas: 5459)
-SequencerFeeVault_Test:test_minWithdrawalAmount() (gas: 5418)
-SequencerFeeVault_Test:test_receive() (gas: 17316)
-SequencerFeeVault_Test:test_revertWithdraw() (gas: 9343)
-SequencerFeeVault_Test:test_withdraw() (gas: 135879)
+ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8965)
+ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008101)
+ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18152)
+ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13911)
+ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 20900)
+ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 20923)
+ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017204)
+ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16023)
+Semver_Test:test_behindProxy_succeeds() (gas: 506725)
+Semver_Test:test_version_succeeds() (gas: 9396)
+SequencerFeeVault_Test:test_constructor_succeeds() (gas: 5504)
+SequencerFeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 5420)
+SequencerFeeVault_Test:test_receive_succeeds() (gas: 17336)
+SequencerFeeVault_Test:test_withdraw_notEnough_reverts() (gas: 9310)
+SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 135878)

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

@@ -12,7 +12,7 @@ contract LegacyMessagePasser_Test is CommonTest {
         messagePasser = new LegacyMessagePasser();
     }
 
-    function test_LegacyMessagePasser_passMessageToL1_Succeeds() external {
+    function test_passMessageToL1_succeeds() external {
         vm.prank(alice);
         messagePasser.passMessageToL1(hex"ff");
         assert(messagePasser.sentMessages(keccak256(abi.encodePacked(hex"ff", alice))));

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

@@ -27,7 +27,7 @@ contract ResourceMetering_Test is CommonTest {
         initialBlockNum = uint64(block.number);
     }
 
-    function test_initialResourceParams() external {
+    function test_meter_initialResourceParams_succeeds() external {
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
 
         assertEq(prevBaseFee, meter.INITIAL_BASE_FEE());
@@ -35,7 +35,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(prevBlockNum, initialBlockNum);
     }
 
-    function test_updateParamsNoChange() external {
+    function test_meter_updateParamsNoChange_succeeds() external {
         meter.use(0); // equivalent to just updating the base fee and block number
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
         meter.use(0);
@@ -46,7 +46,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(postBlockNum, prevBlockNum);
     }
 
-    function test_updateOneEmptyBlock() external {
+    function test_meter_updateOneEmptyBlock_succeeds() external {
         vm.roll(initialBlockNum + 1);
         meter.use(0);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
@@ -57,7 +57,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(prevBlockNum, initialBlockNum + 1);
     }
 
-    function test_updateTwoEmptyBlocks() external {
+    function test_meter_updateTwoEmptyBlocks_succeeds() external {
         vm.roll(initialBlockNum + 2);
         meter.use(0);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
@@ -67,7 +67,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(prevBlockNum, initialBlockNum + 2);
     }
 
-    function test_updateTenEmptyBlocks() external {
+    function test_meter_updateTenEmptyBlocks_succeeds() external {
         vm.roll(initialBlockNum + 10);
         meter.use(0);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
@@ -77,7 +77,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(prevBlockNum, initialBlockNum + 10);
     }
 
-    function test_updateNoGasDelta() external {
+    function test_meter_updateNoGasDelta_succeeds() external {
         uint64 target = uint64(uint256(meter.TARGET_RESOURCE_LIMIT()));
         meter.use(target);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = meter.params();
@@ -87,7 +87,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(prevBlockNum, initialBlockNum);
     }
 
-    function test_useMaxSucceeds() external {
+    function test_meter_useMax_succeeds() external {
         uint64 target = uint64(uint256(meter.TARGET_RESOURCE_LIMIT()));
         uint64 elasticity = uint64(uint256(meter.ELASTICITY_MULTIPLIER()));
         meter.use(target * elasticity);
@@ -102,7 +102,7 @@ contract ResourceMetering_Test is CommonTest {
         assertEq(postBaseFee, 1375000000);
     }
 
-    function test_useMoreThanMaxReverts() external {
+    function test_meter_useMoreThanMax_reverts() external {
         uint64 target = uint64(uint256(meter.TARGET_RESOURCE_LIMIT()));
         uint64 elasticity = uint64(uint256(meter.ELASTICITY_MULTIPLIER()));
         vm.expectRevert("ResourceMetering: cannot buy more gas than available gas limit");

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

@@ -26,7 +26,7 @@ contract Semver_Test is CommonTest {
     /**
      * @notice Test the version getter
      */
-    function test_version() external {
+    function test_version_succeeds() external {
         assertEq(semver.version(), "7.8.0");
     }
 
@@ -35,7 +35,7 @@ contract Semver_Test is CommonTest {
      *         be able to be accessed from behind a proxy without needing
      *         to initialize the contract.
      */
-    function test_behindProxy() external {
+    function test_behindProxy_succeeds() external {
         Proxy proxy = new Proxy(alice);
         vm.prank(alice);
         proxy.upgradeTo(address(semver));

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

@@ -18,15 +18,15 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
         vm.etch(Predeploys.SEQUENCER_FEE_WALLET, address(new SequencerFeeVault(recipient)).code);
     }
 
-    function test_minWithdrawalAmount() external {
+    function test_minWithdrawalAmount_succeeds() external {
         assertEq(vault.MIN_WITHDRAWAL_AMOUNT(), 10 ether);
     }
 
-    function test_constructor() external {
+    function test_constructor_succeeds() external {
         assertEq(vault.l1FeeWallet(), recipient);
     }
 
-    function test_receive() external {
+    function test_receive_succeeds() external {
         assertEq(address(vault).balance, 0);
 
         vm.prank(alice);
@@ -36,7 +36,7 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
         assertEq(address(vault).balance, 100);
     }
 
-    function test_revertWithdraw() external {
+    function test_withdraw_notEnough_reverts() external {
         assert(address(vault).balance < vault.MIN_WITHDRAWAL_AMOUNT());
 
         vm.expectRevert(
@@ -45,7 +45,7 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
         vault.withdraw();
     }
 
-    function test_withdraw() external {
+    function test_withdraw_succeeds() external {
         vm.deal(address(vault), vault.MIN_WITHDRAWAL_AMOUNT() + 1);
 
         vm.expectEmit(true, true, true, true);