Skip to content

fix: Separate fork tests and fixes. #1203

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Separate fork tests and fixes. #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,8 @@ ethereum = { key = "${ETHERSCAN_API_KEY}" }
[profile.local]
test = "test/evm/foundry/local"

# A profile to only run foundry fork tests, skipping local tests. These tests are run in CI. Run with `NODE_URL_1=*** FOUNDRY_PROFILE=fork forge test --fork-url=***`
[profile.fork]
test = "test/evm/foundry/fork"

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
2 changes: 2 additions & 0 deletions script/111DeployUniversalSpokePool.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ contract DeployUniversalSpokePool is Script, Test, DeploymentUtils {
true // implementationOnly
);

address weth = getWrappedNativeToken(info.spokeChainId);

// Log the deployed addresses
console.log("Chain ID:", info.spokeChainId);
console.log("Hub Chain ID:", info.hubChainId);
Expand Down
2 changes: 1 addition & 1 deletion test/evm/foundry/fork/BlacklistedRelayerRecipient.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ contract MockSpokePoolTest is Test {
// USDC blacklist blocks both the sender and recipient. Therefore if we a recipient within a bundle is
// blacklisted, they should be credited for the refund amount that can be claimed later to a new address.
assertEq(usdc.isBlacklisted(recipient1), false, "Recipient1 should not be blacklisted");
vm.prank(0x10DF6B6fe66dd319B1f82BaB2d054cbb61cdAD2e); // USDC blacklister
vm.prank(0x0A06BE16275B95a7d2567fBdAE118b36C7DA78F9); // USDC blacklister
usdc.blacklist(recipient1);
assertEq(usdc.isBlacklisted(recipient1), true, "Recipient1 should be blacklisted");

Expand Down
6 changes: 3 additions & 3 deletions test/evm/foundry/fork/PermissionSplitter.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ contract PermissionSplitterTest is Test {
);
uint256 spokeChainId = 1;

vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
vm.expectRevert();
hubPoolProxy.relaySpokePoolAdminFunction(spokeChainId, spokeFunctionCallData);
vm.expectRevert(OWNABLE_NOT_OWNER_ERROR);
hubPool.relaySpokePoolAdminFunction(spokeChainId, spokeFunctionCallData);
Expand All @@ -187,7 +187,7 @@ contract PermissionSplitterTest is Test {
}

function testTransferOwnership() public {
vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
vm.expectRevert();
hubPoolProxy.transferOwnership(defaultAdmin);

// Should be able to transfer ownership back to default admin in an emergency.
Expand Down Expand Up @@ -264,7 +264,7 @@ contract PermissionSplitterTest is Test {
vm.prank(defaultAdmin);
hubPoolProxy.sync(WETHAddress);

vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
vm.expectRevert();
hubPoolProxy.sync(WETHAddress);
}
}