Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Aug 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8013499
add additional address to exclude
mds1 Aug 9, 2024
e587e02
chore: make public library methods internal
mds1 Aug 9, 2024
d1c5323
remove another public lib method
mds1 Aug 9, 2024
f5ff125
remove additional public lib methods
mds1 Aug 9, 2024
9bcfd78
remove hardcoded assumption now that we know it's lib linking
mds1 Aug 9, 2024
4bb5781
style: forge fmt
mds1 Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/scripts/ForgeArtifacts.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ library MIPSSyscalls {

uint32 internal constant SCHED_QUANTUM = 100_000;
/// @notice Start of the data segment.
tynes marked this conversation as resolved.
Show resolved Hide resolved
uint32 public constant BRK_START = 0x40000000;
uint32 internal constant BRK_START = 0x40000000;

// SYS_CLONE flags
uint32 internal constant CLONE_VM = 0x100;
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 constant internal VM_ADDR = 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D;
/// @dev The address of the first owner in the linked list of owners
address constant SENTINEL_OWNERS = address(0x1);
address constant internal SENTINEL_OWNERS = address(0x1);

/// @dev Get the address from a private key
function getAddr(uint256 pk) internal pure returns (address) {
Expand Down