Merge pull request #4227 from ethereum-optimism/jm/ctb-test-cleanup/2

Test function renaming (SafeCall and RLP libs)

packages/contracts-bedrock/.gas-snapshot

@@ -215,67 +215,67 @@ ProxyAdmin_Test:test_onlyOwnerSetProxyType() (gas: 10749)
 ProxyAdmin_Test:test_owner() (gas: 9783)
 ProxyAdmin_Test:test_proxyType() (gas: 20534)
 ProxyAdmin_Test:test_setImplementationName() (gas: 38923)
-RLPReader_Test:test_readBytes_bytestring00() (gas: 1877)
-RLPReader_Test:test_readBytes_bytestring01() (gas: 1878)
-RLPReader_Test:test_readBytes_bytestring7f() (gas: 1855)
-RLPReader_Test:test_readBytes_invalidListLength() (gas: 3923)
-RLPReader_Test:test_readBytes_invalidPrefix() (gas: 3984)
-RLPReader_Test:test_readBytes_invalidRemainder() (gas: 4135)
-RLPReader_Test:test_readBytes_invalidStringLength() (gas: 3923)
-RLPReader_Test:test_readBytes_revertListItem() (gas: 4021)
-RLPReader_Test:test_readList_dictTest1() (gas: 23248)
-RLPReader_Test:test_readList_empty() (gas: 4634)
-RLPReader_Test:test_readList_incorrectLengthInArray() (gas: 3978)
-RLPReader_Test:test_readList_int32Overflow() (gas: 4094)
-RLPReader_Test:test_readList_int32Overflow2() (gas: 4116)
-RLPReader_Test:test_readList_invalidRemainder() (gas: 4114)
-RLPReader_Test:test_readList_invalidShortList() (gas: 3968)
-RLPReader_Test:test_readList_invalidValue() (gas: 3901)
-RLPReader_Test:test_readList_leadingZerosInLongLengthArray1() (gas: 3982)
-RLPReader_Test:test_readList_leadingZerosInLongLengthArray2() (gas: 3966)
-RLPReader_Test:test_readList_leadingZerosInLongLengthList1() (gas: 3986)
-RLPReader_Test:test_readList_listLongerThan32Elements() (gas: 38594)
-RLPReader_Test:test_readList_listOfLists() (gas: 9460)
-RLPReader_Test:test_readList_listOfLists2() (gas: 12190)
-RLPReader_Test:test_readList_longList1() (gas: 28394)
-RLPReader_Test:test_readList_longList2() (gas: 196876)
-RLPReader_Test:test_readList_longListLessThan56Bytes() (gas: 4068)
-RLPReader_Test:test_readList_longStringLength() (gas: 3945)
-RLPReader_Test:test_readList_longStringLessThan56Bytes() (gas: 3999)
-RLPReader_Test:test_readList_multiList() (gas: 11764)
-RLPReader_Test:test_readList_nonOptimalLongLengthArray1() (gas: 4022)
-RLPReader_Test:test_readList_nonOptimalLongLengthArray2() (gas: 4001)
-RLPReader_Test:test_readList_notEnoughContentForList1() (gas: 4117)
-RLPReader_Test:test_readList_notEnoughContentForList2() (gas: 4148)
-RLPReader_Test:test_readList_notEnoughContentForString1() (gas: 4093)
-RLPReader_Test:test_readList_notEnoughContentForString2() (gas: 4072)
-RLPReader_Test:test_readList_notLongEnough() (gas: 3956)
-RLPReader_Test:test_readList_shortListMax1() (gas: 39768)
-RLPWriter_Test:test_writeList_dictTest1() (gas: 37111)
-RLPWriter_Test:test_writeList_empty() (gas: 1707)
-RLPWriter_Test:test_writeList_listoflists() (gas: 10879)
-RLPWriter_Test:test_writeList_listoflists2() (gas: 16689)
-RLPWriter_Test:test_writeList_longlist1() (gas: 40512)
-RLPWriter_Test:test_writeList_longlist2() (gas: 281303)
-RLPWriter_Test:test_writeList_multiList() (gas: 22589)
-RLPWriter_Test:test_writeList_shortListMax1() (gas: 36940)
-RLPWriter_Test:test_writeList_stringList() (gas: 10767)
-RLPWriter_Test:test_writeString_bytestring00() (gas: 997)
-RLPWriter_Test:test_writeString_bytestring01() (gas: 1019)
-RLPWriter_Test:test_writeString_bytestring7f() (gas: 999)
-RLPWriter_Test:test_writeString_empty() (gas: 1664)
-RLPWriter_Test:test_writeString_longstring() (gas: 16971)
-RLPWriter_Test:test_writeString_longstring2() (gas: 258801)
-RLPWriter_Test:test_writeString_shortstring() (gas: 2481)
-RLPWriter_Test:test_writeString_shortstring2() (gas: 15388)
-RLPWriter_Test:test_writeUint_mediumint() (gas: 8417)
-RLPWriter_Test:test_writeUint_mediumint2() (gas: 8715)
-RLPWriter_Test:test_writeUint_mediumint3() (gas: 9137)
-RLPWriter_Test:test_writeUint_smallint() (gas: 7279)
-RLPWriter_Test:test_writeUint_smallint2() (gas: 7281)
-RLPWriter_Test:test_writeUint_smallint3() (gas: 7301)
-RLPWriter_Test:test_writeUint_smallint4() (gas: 7280)
-RLPWriter_Test:test_writeUint_zero() (gas: 7749)
+RLPReader_Test:test_readBytes_bytestring00_succeeds() (gas: 1857)
+RLPReader_Test:test_readBytes_bytestring01_succeeds() (gas: 1900)
+RLPReader_Test:test_readBytes_bytestring7f_succeeds() (gas: 1898)
+RLPReader_Test:test_readBytes_invalidListLength_reverts() (gas: 3925)
+RLPReader_Test:test_readBytes_invalidPrefix_reverts() (gas: 3983)
+RLPReader_Test:test_readBytes_invalidRemainder_reverts() (gas: 4177)
+RLPReader_Test:test_readBytes_invalidStringLength_reverts() (gas: 3880)
+RLPReader_Test:test_readBytes_revertListItem_reverts() (gas: 4043)
+RLPReader_Test:test_readList_dictTest1_succeeds() (gas: 23202)
+RLPReader_Test:test_readList_empty_succeeds() (gas: 4613)
+RLPReader_Test:test_readList_incorrectLengthInArray_reverts() (gas: 3954)
+RLPReader_Test:test_readList_int32Overflow2_reverts() (gas: 4117)
+RLPReader_Test:test_readList_int32Overflow_reverts() (gas: 4116)
+RLPReader_Test:test_readList_invalidRemainder_reverts() (gas: 4158)
+RLPReader_Test:test_readList_invalidShortList_reverts() (gas: 3967)
+RLPReader_Test:test_readList_invalidValue_reverts() (gas: 3879)
+RLPReader_Test:test_readList_leadingZerosInLongLengthArray1_reverts() (gas: 3982)
+RLPReader_Test:test_readList_leadingZerosInLongLengthArray2_reverts() (gas: 3968)
+RLPReader_Test:test_readList_leadingZerosInLongLengthList1_reverts() (gas: 4007)
+RLPReader_Test:test_readList_listLongerThan32Elements_reverts() (gas: 38571)
+RLPReader_Test:test_readList_listOfLists2_succeeds() (gas: 12169)
+RLPReader_Test:test_readList_listOfLists_succeeds() (gas: 9482)
+RLPReader_Test:test_readList_longList1_succeeds() (gas: 28417)
+RLPReader_Test:test_readList_longList2_succeeds() (gas: 196855)
+RLPReader_Test:test_readList_longListLessThan56Bytes_reverts() (gas: 4046)
+RLPReader_Test:test_readList_longStringLength_reverts() (gas: 3924)
+RLPReader_Test:test_readList_longStringLessThan56Bytes_reverts() (gas: 3998)
+RLPReader_Test:test_readList_multiList_succeeds() (gas: 11784)
+RLPReader_Test:test_readList_nonOptimalLongLengthArray1_reverts() (gas: 3999)
+RLPReader_Test:test_readList_nonOptimalLongLengthArray2_reverts() (gas: 4000)
+RLPReader_Test:test_readList_notEnoughContentForList1_reverts() (gas: 4138)
+RLPReader_Test:test_readList_notEnoughContentForList2_reverts() (gas: 4139)
+RLPReader_Test:test_readList_notEnoughContentForString1_reverts() (gas: 4094)
+RLPReader_Test:test_readList_notEnoughContentForString2_reverts() (gas: 4138)
+RLPReader_Test:test_readList_notLongEnough_reverts() (gas: 3933)
+RLPReader_Test:test_readList_shortListMax1_succeeds() (gas: 39747)
+RLPWriter_Test:test_writeList_dictTest1_succeeds() (gas: 37112)
+RLPWriter_Test:test_writeList_empty_succeeds() (gas: 1743)
+RLPWriter_Test:test_writeList_listoflists2_succeeds() (gas: 16656)
+RLPWriter_Test:test_writeList_listoflists_succeeds() (gas: 10857)
+RLPWriter_Test:test_writeList_longlist1_succeeds() (gas: 40467)
+RLPWriter_Test:test_writeList_longlist2_succeeds() (gas: 281281)
+RLPWriter_Test:test_writeList_multiList_succeeds() (gas: 22566)
+RLPWriter_Test:test_writeList_shortListMax1_succeeds() (gas: 36918)
+RLPWriter_Test:test_writeList_stringList_succeeds() (gas: 10742)
+RLPWriter_Test:test_writeString_bytestring00_succeeds() (gas: 977)
+RLPWriter_Test:test_writeString_bytestring01_succeeds() (gas: 998)
+RLPWriter_Test:test_writeString_bytestring7f_succeeds() (gas: 1019)
+RLPWriter_Test:test_writeString_empty_succeeds() (gas: 1644)
+RLPWriter_Test:test_writeString_longstring2_succeeds() (gas: 258779)
+RLPWriter_Test:test_writeString_longstring_succeeds() (gas: 16994)
+RLPWriter_Test:test_writeString_shortstring2_succeeds() (gas: 15409)
+RLPWriter_Test:test_writeString_shortstring_succeeds() (gas: 2480)
+RLPWriter_Test:test_writeUint_mediumint2_succeeds() (gas: 8702)
+RLPWriter_Test:test_writeUint_mediumint3_succeeds() (gas: 9123)
+RLPWriter_Test:test_writeUint_mediumint_succeeds() (gas: 8405)
+RLPWriter_Test:test_writeUint_smallint2_succeeds() (gas: 7290)
+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)
@@ -284,7 +284,6 @@ ResourceMetering_Test:test_updateTenEmptyBlocks() (gas: 20899)
 ResourceMetering_Test:test_updateTwoEmptyBlocks() (gas: 20945)
 ResourceMetering_Test:test_useMaxSucceeds() (gas: 8017170)
 ResourceMetering_Test:test_useMoreThanMaxReverts() (gas: 16045)
-SafeCall_Test:test_safeCall(address,address,uint256,uint64,bytes) (runs: 256, μ: 43316, ~: 45640)
 Semver_Test:test_behindProxy() (gas: 506748)
 Semver_Test:test_version() (gas: 9373)
 SequencerFeeVault_Test:test_constructor() (gas: 5459)

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

@@ -5,41 +5,41 @@ import { RLPWriter } from "../libraries/rlp/RLPWriter.sol";
 import { CommonTest } from "./CommonTest.t.sol";
 
 contract RLPWriter_Test is CommonTest {
-    function test_writeString_empty() external {
+    function test_writeString_empty_succeeds() external {
         assertEq(RLPWriter.writeString(""), hex"80");
     }
 
-    function test_writeString_bytestring00() external {
+    function test_writeString_bytestring00_succeeds() external {
         assertEq(RLPWriter.writeString("\u0000"), hex"00");
     }
 
-    function test_writeString_bytestring01() external {
+    function test_writeString_bytestring01_succeeds() external {
         assertEq(RLPWriter.writeString("\u0001"), hex"01");
     }
 
-    function test_writeString_bytestring7f() external {
+    function test_writeString_bytestring7f_succeeds() external {
         assertEq(RLPWriter.writeString("\u007F"), hex"7f");
     }
 
-    function test_writeString_shortstring() external {
+    function test_writeString_shortstring_succeeds() external {
         assertEq(RLPWriter.writeString("dog"), hex"83646f67");
     }
 
-    function test_writeString_shortstring2() external {
+    function test_writeString_shortstring2_succeeds() external {
         assertEq(
             RLPWriter.writeString("Lorem ipsum dolor sit amet, consectetur adipisicing eli"),
             hex"b74c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c69"
         );
     }
 
-    function test_writeString_longstring() external {
+    function test_writeString_longstring_succeeds() external {
         assertEq(
             RLPWriter.writeString("Lorem ipsum dolor sit amet, consectetur adipisicing elit"),
             hex"b8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974"
         );
     }
 
-    function test_writeString_longstring2() external {
+    function test_writeString_longstring2_succeeds() external {
         assertEq(
             RLPWriter.writeString(
                 "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur mauris magna, suscipit sed vehicula non, iaculis faucibus tortor. Proin suscipit ultricies malesuada. Duis tortor elit, dictum quis tristique eu, ultrices at risus. Morbi a est imperdiet mi ullamcorper aliquet suscipit nec lorem. Aenean quis leo mollis, vulputate elit varius, consequat enim. Nulla ultrices turpis justo, et posuere urna consectetur nec. Proin non convallis metus. Donec tempor ipsum in mauris congue sollicitudin. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse convallis sem vel massa faucibus, eget lacinia lacus tempor. Nulla quis ultricies purus. Proin auctor rhoncus nibh condimentum mollis. Aliquam consequat enim at metus luctus, a eleifend purus egestas. Curabitur at nibh metus. Nam bibendum, neque at auctor tristique, lorem libero aliquet arcu, non interdum tellus lectus sit amet eros. Cras rhoncus, metus ac ornare cursus, dolor justo ultrices metus, at ullamcorper volutpat"
@@ -48,43 +48,43 @@ contract RLPWriter_Test is CommonTest {
         );
     }
 
-    function test_writeUint_zero() external {
+    function test_writeUint_zero_succeeds() external {
         assertEq(RLPWriter.writeUint(0x0), hex"80");
     }
 
-    function test_writeUint_smallint() external {
+    function test_writeUint_smallint_succeeds() external {
         assertEq(RLPWriter.writeUint(1), hex"01");
     }
 
-    function test_writeUint_smallint2() external {
+    function test_writeUint_smallint2_succeeds() external {
         assertEq(RLPWriter.writeUint(16), hex"10");
     }
 
-    function test_writeUint_smallint3() external {
+    function test_writeUint_smallint3_succeeds() external {
         assertEq(RLPWriter.writeUint(79), hex"4f");
     }
 
-    function test_writeUint_smallint4() external {
+    function test_writeUint_smallint4_succeeds() external {
         assertEq(RLPWriter.writeUint(127), hex"7f");
     }
 
-    function test_writeUint_mediumint() external {
+    function test_writeUint_mediumint_succeeds() external {
         assertEq(RLPWriter.writeUint(128), hex"8180");
     }
 
-    function test_writeUint_mediumint2() external {
+    function test_writeUint_mediumint2_succeeds() external {
         assertEq(RLPWriter.writeUint(1000), hex"8203e8");
     }
 
-    function test_writeUint_mediumint3() external {
+    function test_writeUint_mediumint3_succeeds() external {
         assertEq(RLPWriter.writeUint(100000), hex"830186a0");
     }
 
-    function test_writeList_empty() external {
+    function test_writeList_empty_succeeds() external {
         assertEq(RLPWriter.writeList(new bytes[](0)), hex"c0");
     }
 
-    function test_writeList_stringList() external {
+    function test_writeList_stringList_succeeds() external {
         bytes[] memory list = new bytes[](3);
         list[0] = RLPWriter.writeString("dog");
         list[1] = RLPWriter.writeString("god");
@@ -93,7 +93,7 @@ contract RLPWriter_Test is CommonTest {
         assertEq(RLPWriter.writeList(list), hex"cc83646f6783676f6483636174");
     }
 
-    function test_writeList_multiList() external {
+    function test_writeList_multiList_succeeds() external {
         bytes[] memory list = new bytes[](3);
         bytes[] memory list2 = new bytes[](1);
         list2[0] = RLPWriter.writeUint(4);
@@ -105,7 +105,7 @@ contract RLPWriter_Test is CommonTest {
         assertEq(RLPWriter.writeList(list), hex"c6827a77c10401");
     }
 
-    function test_writeList_shortListMax1() external {
+    function test_writeList_shortListMax1_succeeds() external {
         bytes[] memory list = new bytes[](11);
         list[0] = RLPWriter.writeString("asdf");
         list[1] = RLPWriter.writeString("qwer");
@@ -125,7 +125,7 @@ contract RLPWriter_Test is CommonTest {
         );
     }
 
-    function test_writeList_longlist1() external {
+    function test_writeList_longlist1_succeeds() external {
         bytes[] memory list = new bytes[](4);
         bytes[] memory list2 = new bytes[](3);
 
@@ -144,7 +144,7 @@ contract RLPWriter_Test is CommonTest {
         );
     }
 
-    function test_writeList_longlist2() external {
+    function test_writeList_longlist2_succeeds() external {
         bytes[] memory list = new bytes[](32);
         bytes[] memory list2 = new bytes[](3);
 
@@ -162,7 +162,7 @@ contract RLPWriter_Test is CommonTest {
         );
     }
 
-    function test_writeList_listoflists() external {
+    function test_writeList_listoflists_succeeds() external {
         // [ [ [], [] ], [] ]
         bytes[] memory list = new bytes[](2);
         bytes[] memory list2 = new bytes[](2);
@@ -176,7 +176,7 @@ contract RLPWriter_Test is CommonTest {
         assertEq(RLPWriter.writeList(list), hex"c4c2c0c0c0");
     }
 
-    function test_writeList_listoflists2() external {
+    function test_writeList_listoflists2_succeeds() external {
         // [ [], [[]], [ [], [[]] ] ]
         bytes[] memory list = new bytes[](3);
         list[0] = RLPWriter.writeList(new bytes[](0));
@@ -195,7 +195,7 @@ contract RLPWriter_Test is CommonTest {
         assertEq(RLPWriter.writeList(list), hex"c7c0c1c0c3c0c1c0");
     }
 
-    function test_writeList_dictTest1() external {
+    function test_writeList_dictTest1_succeeds() external {
         bytes[] memory list = new bytes[](4);
 
         bytes[] memory list1 = new bytes[](2);

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

@@ -5,7 +5,7 @@ import { CommonTest } from "./CommonTest.t.sol";
 import { SafeCall } from "../libraries/SafeCall.sol";
 
 contract SafeCall_Test is CommonTest {
-    function test_safeCall(
+    function testFuzz_safeCall_succeeds(
         address from,
         address to,
         uint256 gas,