fix(ctb): remove linked libraries from scripts and tests (#11426)

* add additional address to exclude * chore: make public library methods internal * remove another public lib method * remove additional public lib methods * remove hardcoded assumption now that we know it's lib linking * style: forge fmt
ethereum-optimism · Aug 9, 2024 · b1dfa22 · b1dfa22
1 parent cdfe8a8
commit b1dfa22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/contracts-bedrock/scripts/ForgeArtifacts.sol b/packages/contracts-bedrock/scripts/ForgeArtifacts.sol
@@ -54,7 +54,7 @@ library ForgeArtifacts {
     }
 
     /// @notice Returns the storage layout for a deployed contract.
-    function getStorageLayout(string memory _name) public returns (string memory layout_) {
+    function getStorageLayout(string memory _name) internal returns (string memory layout_) {
         string[] memory cmd = new string[](3);
         cmd[0] = Executables.bash;
         cmd[1] = "-c";
@@ -64,7 +64,7 @@ library ForgeArtifacts {
     }
 
     /// @notice Returns the abi from a the forge artifact
-    function getAbi(string memory _name) public returns (string memory abi_) {
+    function getAbi(string memory _name) internal returns (string memory abi_) {
         string[] memory cmd = new string[](3);
         cmd[0] = Executables.bash;
         cmd[1] = "-c";

diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -99,7 +99,7 @@ library MIPSSyscalls {
 
     uint32 internal constant SCHED_QUANTUM = 100_000;
     /// @notice Start of the data segment.
-    uint32 public constant BRK_START = 0x40000000;
+    uint32 internal constant BRK_START = 0x40000000;
 
     // SYS_CLONE flags
     uint32 internal constant CLONE_VM = 0x100;

diff --git a/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol b/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
@@ -54,17 +54,17 @@ struct SafeInstance {
 
 library Sort {
     /// @dev Sorts an array of addresses in place
-    function sort(address[] memory arr) public pure returns (address[] memory) {
+    function sort(address[] memory arr) internal pure returns (address[] memory) {
         LibSort.sort(arr);
         return arr;
     }
 }
 
 library SafeTestLib {
     /// @dev The address of foundry's VM contract
-    address constant VM_ADDR = 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D;
+    address internal constant VM_ADDR = 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D;
     /// @dev The address of the first owner in the linked list of owners
-    address constant SENTINEL_OWNERS = address(0x1);
+    address internal constant SENTINEL_OWNERS = address(0x1);
 
     /// @dev Get the address from a private key
     function getAddr(uint256 pk) internal pure returns (address) {