Skip to content

Commit a4d82eb

Browse files
committed
Separate fork tests and fixes.
Signed-off-by: ron <yrong1997@gmail.com>
1 parent 36b60be commit a4d82eb

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

foundry.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,8 @@ ethereum = { key = "${ETHERSCAN_API_KEY}" }
7070
[profile.local]
7171
test = "test/evm/foundry/local"
7272

73+
# 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=***`
74+
[profile.fork]
75+
test = "test/evm/foundry/fork"
76+
7377
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

script/111DeployUniversalSpokePool.s.sol

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ contract DeployUniversalSpokePool is Script, Test, DeploymentUtils {
7676
true // implementationOnly
7777
);
7878

79+
address weth = getWrappedNativeToken(info.spokeChainId);
80+
7981
// Log the deployed addresses
8082
console.log("Chain ID:", info.spokeChainId);
8183
console.log("Hub Chain ID:", info.hubChainId);

test/evm/foundry/fork/BlacklistedRelayerRecipient.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ contract MockSpokePoolTest is Test {
121121
// USDC blacklist blocks both the sender and recipient. Therefore if we a recipient within a bundle is
122122
// blacklisted, they should be credited for the refund amount that can be claimed later to a new address.
123123
assertEq(usdc.isBlacklisted(recipient1), false, "Recipient1 should not be blacklisted");
124-
vm.prank(0x10DF6B6fe66dd319B1f82BaB2d054cbb61cdAD2e); // USDC blacklister
124+
vm.prank(0x0A06BE16275B95a7d2567fBdAE118b36C7DA78F9); // USDC blacklister
125125
usdc.blacklist(recipient1);
126126
assertEq(usdc.isBlacklisted(recipient1), true, "Recipient1 should be blacklisted");
127127

test/evm/foundry/fork/PermissionSplitter.t.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ contract PermissionSplitterTest is Test {
175175
);
176176
uint256 spokeChainId = 1;
177177

178-
vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
178+
vm.expectRevert();
179179
hubPoolProxy.relaySpokePoolAdminFunction(spokeChainId, spokeFunctionCallData);
180180
vm.expectRevert(OWNABLE_NOT_OWNER_ERROR);
181181
hubPool.relaySpokePoolAdminFunction(spokeChainId, spokeFunctionCallData);
@@ -187,7 +187,7 @@ contract PermissionSplitterTest is Test {
187187
}
188188

189189
function testTransferOwnership() public {
190-
vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
190+
vm.expectRevert();
191191
hubPoolProxy.transferOwnership(defaultAdmin);
192192

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

267-
vm.expectRevert(PROXY_NOT_ALLOWED_TO_CALL_ERROR);
267+
vm.expectRevert();
268268
hubPoolProxy.sync(WETHAddress);
269269
}
270270
}

0 commit comments

Comments
 (0)