Merge pull request #8031 from ethereum-optimism/ctb/rlp-test-simplify

contracts-bedrock: simplify rlp tests

packages/contracts-bedrock/.gas-snapshot

@@ -587,44 +587,44 @@ Proxy_Test:test_upgradeToAndCall_functionDoesNotExist_reverts() (gas: 107980)
 Proxy_Test:test_upgradeToAndCall_isPayable_succeeds() (gas: 53744)
 Proxy_Test:test_upgradeToAndCall_succeeds() (gas: 125192)
 Proxy_Test:test_upgradeTo_clashingFunctionSignatures_succeeds() (gas: 101363)
-RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1863)
-RLPReader_readBytes_Test:test_readBytes_bytestring01_succeeds() (gas: 1840)
+RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1841)
+RLPReader_readBytes_Test:test_readBytes_bytestring01_succeeds() (gas: 1818)
 RLPReader_readBytes_Test:test_readBytes_bytestring7f_succeeds() (gas: 1861)
-RLPReader_readBytes_Test:test_readBytes_invalidListLength_reverts() (gas: 3903)
+RLPReader_readBytes_Test:test_readBytes_invalidListLength_reverts() (gas: 3946)
 RLPReader_readBytes_Test:test_readBytes_invalidPrefix_reverts() (gas: 3961)
 RLPReader_readBytes_Test:test_readBytes_invalidRemainder_reverts() (gas: 4155)
 RLPReader_readBytes_Test:test_readBytes_invalidStringLength_reverts() (gas: 3857)
 RLPReader_readBytes_Test:test_readBytes_revertListItem_reverts() (gas: 3998)
 RLPReader_readList_Test:test_readList_dictTest1_succeeds() (gas: 23140)
 RLPReader_readList_Test:test_readList_empty_succeeds() (gas: 4610)
-RLPReader_readList_Test:test_readList_incorrectLengthInArray_reverts() (gas: 3976)
+RLPReader_readList_Test:test_readList_incorrectLengthInArray_reverts() (gas: 3954)
 RLPReader_readList_Test:test_readList_int32Overflow2_reverts() (gas: 4139)
-RLPReader_readList_Test:test_readList_int32Overflow_reverts() (gas: 4138)
+RLPReader_readList_Test:test_readList_int32Overflow_reverts() (gas: 4116)
 RLPReader_readList_Test:test_readList_invalidRemainder_reverts() (gas: 4114)
 RLPReader_readList_Test:test_readList_invalidShortList_reverts() (gas: 3967)
 RLPReader_readList_Test:test_readList_invalidValue_reverts() (gas: 3878)
 RLPReader_readList_Test:test_readList_leadingZerosInLongLengthArray1_reverts() (gas: 3982)
-RLPReader_readList_Test:test_readList_leadingZerosInLongLengthArray2_reverts() (gas: 3945)
+RLPReader_readList_Test:test_readList_leadingZerosInLongLengthArray2_reverts() (gas: 3968)
 RLPReader_readList_Test:test_readList_leadingZerosInLongLengthList1_reverts() (gas: 3984)
-RLPReader_readList_Test:test_readList_listLongerThan32Elements_reverts() (gas: 38612)
+RLPReader_readList_Test:test_readList_listLongerThan32Elements_reverts() (gas: 38590)
 RLPReader_readList_Test:test_readList_listOfLists2_succeeds() (gas: 12122)
-RLPReader_readList_Test:test_readList_listOfLists_succeeds() (gas: 9472)
-RLPReader_readList_Test:test_readList_longList1_succeeds() (gas: 28354)
-RLPReader_readList_Test:test_readList_longList2_succeeds() (gas: 196352)
-RLPReader_readList_Test:test_readList_longListLessThan56Bytes_reverts() (gas: 4023)
-RLPReader_readList_Test:test_readList_longStringLength_reverts() (gas: 3946)
+RLPReader_readList_Test:test_readList_listOfLists_succeeds() (gas: 9450)
+RLPReader_readList_Test:test_readList_longList1_succeeds() (gas: 28332)
+RLPReader_readList_Test:test_readList_longList2_succeeds() (gas: 196395)
+RLPReader_readList_Test:test_readList_longListLessThan56Bytes_reverts() (gas: 4046)
+RLPReader_readList_Test:test_readList_longStringLength_reverts() (gas: 3924)
 RLPReader_readList_Test:test_readList_longStringLessThan56Bytes_reverts() (gas: 4009)
-RLPReader_readList_Test:test_readList_multiList_succeeds() (gas: 11695)
+RLPReader_readList_Test:test_readList_multiList_succeeds() (gas: 11737)
 RLPReader_readList_Test:test_readList_nonOptimalLongLengthArray1_reverts() (gas: 3999)
-RLPReader_readList_Test:test_readList_nonOptimalLongLengthArray2_reverts() (gas: 4044)
+RLPReader_readList_Test:test_readList_nonOptimalLongLengthArray2_reverts() (gas: 4022)
 RLPReader_readList_Test:test_readList_notEnoughContentForList1_reverts() (gas: 4115)
-RLPReader_readList_Test:test_readList_notEnoughContentForList2_reverts() (gas: 4117)
+RLPReader_readList_Test:test_readList_notEnoughContentForList2_reverts() (gas: 4161)
 RLPReader_readList_Test:test_readList_notEnoughContentForString1_reverts() (gas: 4072)
-RLPReader_readList_Test:test_readList_notEnoughContentForString2_reverts() (gas: 4094)
+RLPReader_readList_Test:test_readList_notEnoughContentForString2_reverts() (gas: 4138)
 RLPReader_readList_Test:test_readList_notLongEnough_reverts() (gas: 3955)
-RLPReader_readList_Test:test_readList_shortListMax1_succeeds() (gas: 39602)
+RLPReader_readList_Test:test_readList_shortListMax1_succeeds() (gas: 39580)
 RLPWriter_writeList_Test:test_writeList_dictTest1_succeeds() (gas: 36979)
-RLPWriter_writeList_Test:test_writeList_empty_succeeds() (gas: 1711)
+RLPWriter_writeList_Test:test_writeList_empty_succeeds() (gas: 1666)
 RLPWriter_writeList_Test:test_writeList_listoflists2_succeeds() (gas: 16566)
 RLPWriter_writeList_Test:test_writeList_listoflists_succeeds() (gas: 10841)
 RLPWriter_writeList_Test:test_writeList_longlist1_succeeds() (gas: 40383)
@@ -632,22 +632,22 @@ RLPWriter_writeList_Test:test_writeList_longlist2_succeeds() (gas: 280754)
 RLPWriter_writeList_Test:test_writeList_multiList_succeeds() (gas: 22446)
 RLPWriter_writeList_Test:test_writeList_shortListMax1_succeeds() (gas: 36793)
 RLPWriter_writeList_Test:test_writeList_stringList_succeeds() (gas: 10697)
-RLPWriter_writeString_Test:test_writeString_bytestring00_succeeds() (gas: 951)
-RLPWriter_writeString_Test:test_writeString_bytestring01_succeeds() (gas: 951)
+RLPWriter_writeString_Test:test_writeString_bytestring00_succeeds() (gas: 929)
+RLPWriter_writeString_Test:test_writeString_bytestring01_succeeds() (gas: 906)
 RLPWriter_writeString_Test:test_writeString_bytestring7f_succeeds() (gas: 972)
-RLPWriter_writeString_Test:test_writeString_empty_succeeds() (gas: 1633)
+RLPWriter_writeString_Test:test_writeString_empty_succeeds() (gas: 1611)
 RLPWriter_writeString_Test:test_writeString_longstring2_succeeds() (gas: 258768)
-RLPWriter_writeString_Test:test_writeString_longstring_succeeds() (gas: 16961)
+RLPWriter_writeString_Test:test_writeString_longstring_succeeds() (gas: 16939)
 RLPWriter_writeString_Test:test_writeString_shortstring2_succeeds() (gas: 15376)
 RLPWriter_writeString_Test:test_writeString_shortstring_succeeds() (gas: 2470)
-RLPWriter_writeUint_Test:test_writeUint_mediumint2_succeeds() (gas: 8721)
+RLPWriter_writeUint_Test:test_writeUint_mediumint2_succeeds() (gas: 8699)
 RLPWriter_writeUint_Test:test_writeUint_mediumint3_succeeds() (gas: 9098)
-RLPWriter_writeUint_Test:test_writeUint_mediumint_succeeds() (gas: 8357)
+RLPWriter_writeUint_Test:test_writeUint_mediumint_succeeds() (gas: 8380)
 RLPWriter_writeUint_Test:test_writeUint_smallint2_succeeds() (gas: 7249)
 RLPWriter_writeUint_Test:test_writeUint_smallint3_succeeds() (gas: 7271)
-RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7272)
-RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7250)
-RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7734)
+RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7250)
+RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7294)
+RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7777)
 ResolvedDelegateProxy_Test:test_fallback_addressManagerNotSet_reverts() (gas: 605906)
 ResolvedDelegateProxy_Test:test_fallback_delegateCallBar_reverts() (gas: 24783)
 ResourceMetering_Test:test_meter_denominatorEq1_reverts() (gas: 20024064)

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

@@ -2,10 +2,10 @@
 pragma solidity 0.8.15;
 
 import { stdError } from "forge-std/Test.sol";
-import { CommonTest } from "test/CommonTest.t.sol";
+import { Test } from "forge-std/Test.sol";
 import { RLPReader } from "src/libraries/rlp/RLPReader.sol";
 
-contract RLPReader_readBytes_Test is CommonTest {
+contract RLPReader_readBytes_Test is Test {
     function test_readBytes_bytestring00_succeeds() external {
         assertEq(RLPReader.readBytes(hex"00"), hex"00");
     }
@@ -44,7 +44,7 @@ contract RLPReader_readBytes_Test is CommonTest {
     }
 }
 
-contract RLPReader_readList_Test is CommonTest {
+contract RLPReader_readList_Test is Test {
     function test_readList_empty_succeeds() external {
         RLPReader.RLPItem[] memory list = RLPReader.readList(hex"c0");
         assertEq(list.length, 0);

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

@@ -2,9 +2,9 @@
 pragma solidity 0.8.15;
 
 import { RLPWriter } from "src/libraries/rlp/RLPWriter.sol";
-import { CommonTest } from "test/CommonTest.t.sol";
+import { Test } from "forge-std/Test.sol";
 
-contract RLPWriter_writeString_Test is CommonTest {
+contract RLPWriter_writeString_Test is Test {
     function test_writeString_empty_succeeds() external {
         assertEq(RLPWriter.writeString(""), hex"80");
     }
@@ -49,7 +49,7 @@ contract RLPWriter_writeString_Test is CommonTest {
     }
 }
 
-contract RLPWriter_writeUint_Test is CommonTest {
+contract RLPWriter_writeUint_Test is Test {
     function test_writeUint_zero_succeeds() external {
         assertEq(RLPWriter.writeUint(0x0), hex"80");
     }
@@ -83,7 +83,7 @@ contract RLPWriter_writeUint_Test is CommonTest {
     }
 }
 
-contract RLPWriter_writeList_Test is CommonTest {
+contract RLPWriter_writeList_Test is Test {
     function test_writeList_empty_succeeds() external {
         assertEq(RLPWriter.writeList(new bytes[](0)), hex"c0");
     }