Skip to content

Commit 2d67968

Browse files
anna-carrollanna-carroll
committed
fix: impl disallowed enter test
1 parent 0c98fb6 commit 2d67968

File tree

2 files changed

+65
-63
lines changed

2 files changed

+65
-63
lines changed

‎.gas-snapshot‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
GnosisSafeTest:test_gnosis_receive() (gas: 16106)
2-
OrderOriginPermit2Test:test_fillPermit2() (gas: 174723)
3-
OrderOriginPermit2Test:test_fillPermit2_multi() (gas: 510586)
4-
OrderOriginPermit2Test:test_initiatePermit2() (gas: 187081)
5-
OrderOriginPermit2Test:test_initiatePermit2_multi() (gas: 470943)
6-
OrdersTest:test_fill_ERC20() (gas: 76273)
7-
OrdersTest:test_fill_ETH() (gas: 73740)
8-
OrdersTest:test_fill_both() (gas: 179143)
9-
OrdersTest:test_fill_multiETH() (gas: 141885)
10-
OrdersTest:test_fill_underflowETH() (gas: 120789)
11-
OrdersTest:test_initiate_ERC20() (gas: 90588)
12-
OrdersTest:test_initiate_ETH() (gas: 53217)
13-
OrdersTest:test_initiate_both() (gas: 130158)
14-
OrdersTest:test_initiate_multiERC20() (gas: 186451)
15-
OrdersTest:test_initiate_multiETH() (gas: 86339)
16-
OrdersTest:test_orderExpired() (gas: 32846)
17-
OrdersTest:test_sweepERC20() (gas: 62965)
18-
OrdersTest:test_sweepETH() (gas: 90833)
19-
OrdersTest:test_underflowETH() (gas: 69404)
20-
PassageFuzzTest:test_enter(uint256,address,uint256) (runs: 261, μ: 20920, ~: 20920)
21-
PassageFuzzTest:test_enterToken(uint256,address,uint256) (runs: 261, μ: 66400, ~: 66400)
22-
PassageFuzzTest:test_enterToken_defaultChain(address,uint256) (runs: 260, μ: 67183, ~: 67183)
23-
PassageFuzzTest:test_enter_defaultChain(address,uint56) (runs: 263, μ: 21804, ~: 21804)
24-
PassageFuzzTest:test_fallback(uint256,bytes) (runs: 260, μ: 22179, ~: 22177)
25-
PassageFuzzTest:test_onlyTokenAdmin(address,address,bool,address,uint256) (runs: 263, μ: 16415, ~: 16415)
26-
PassageFuzzTest:test_receive(uint256) (runs: 260, μ: 20906, ~: 20906)
27-
PassageFuzzTest:test_withdraw(address,uint256) (runs: 260, μ: 67525, ~: 67549)
28-
PassagePermit2Test:test_disallowedEnterPermit2() (gas: 1130187)
29-
PassagePermit2Test:test_enterTokenPermit2() (gas: 150794)
30-
PassageTest:test_configureEnter() (gas: 141651)
31-
PassageTest:test_disallowedEnter() (gas: 58928)
2+
OrderOriginPermit2Test:test_fillPermit2() (gas: 174849)
3+
OrderOriginPermit2Test:test_fillPermit2_multi() (gas: 510712)
4+
OrderOriginPermit2Test:test_initiatePermit2() (gas: 187207)
5+
OrderOriginPermit2Test:test_initiatePermit2_multi() (gas: 471069)
6+
OrdersTest:test_fill_ERC20() (gas: 76399)
7+
OrdersTest:test_fill_ETH() (gas: 73682)
8+
OrdersTest:test_fill_both() (gas: 179085)
9+
OrdersTest:test_fill_multiETH() (gas: 141643)
10+
OrdersTest:test_fill_underflowETH() (gas: 120697)
11+
OrdersTest:test_initiate_ERC20() (gas: 90714)
12+
OrdersTest:test_initiate_ETH() (gas: 53343)
13+
OrdersTest:test_initiate_both() (gas: 130284)
14+
OrdersTest:test_initiate_multiERC20() (gas: 186577)
15+
OrdersTest:test_initiate_multiETH() (gas: 86465)
16+
OrdersTest:test_orderExpired() (gas: 32938)
17+
OrdersTest:test_sweepERC20() (gas: 63091)
18+
OrdersTest:test_sweepETH() (gas: 90901)
19+
OrdersTest:test_underflowETH() (gas: 69496)
20+
PassageFuzzTest:test_disallowedEnter(address,address,uint256) (runs: 266, μ: 19249, ~: 19249)
21+
PassageFuzzTest:test_enter(uint256,address,uint256) (runs: 264, μ: 20920, ~: 20920)
22+
PassageFuzzTest:test_enterToken(uint256,address,uint256) (runs: 264, μ: 66342, ~: 66342)
23+
PassageFuzzTest:test_enterToken_defaultChain(address,uint256) (runs: 262, μ: 67125, ~: 67125)
24+
PassageFuzzTest:test_enter_defaultChain(address,uint56) (runs: 267, μ: 21804, ~: 21804)
25+
PassageFuzzTest:test_fallback(uint256,bytes) (runs: 264, μ: 21921, ~: 21921)
26+
PassageFuzzTest:test_onlyTokenAdmin(address,address,bool,address,uint256) (runs: 267, μ: 16507, ~: 16507)
27+
PassageFuzzTest:test_receive(uint256) (runs: 264, μ: 20719, ~: 20719)
28+
PassageFuzzTest:test_withdraw(address,uint256) (runs: 262, μ: 67480, ~: 67501)
29+
PassagePermit2Test:test_disallowedEnterPermit2() (gas: 1130279)
30+
PassagePermit2Test:test_enterTokenPermit2() (gas: 150920)
31+
PassageTest:test_configureEnter() (gas: 141961)
32+
PassageTest:test_disallowedEnter() (gas: 59020)
3233
PassageTest:test_enter() (gas: 26523)
33-
PassageTest:test_enterToken() (gas: 66880)
34-
PassageTest:test_enterToken_defaultChain() (gas: 65384)
34+
PassageTest:test_enterToken() (gas: 67006)
35+
PassageTest:test_enterToken_defaultChain() (gas: 65510)
3536
PassageTest:test_enter_defaultChain() (gas: 24949)
36-
PassageTest:test_fallback() (gas: 22784)
37-
PassageTest:test_onlyTokenAdmin() (gas: 19145)
38-
PassageTest:test_receive() (gas: 22222)
37+
PassageTest:test_fallback() (gas: 22528)
38+
PassageTest:test_onlyTokenAdmin() (gas: 19237)
39+
PassageTest:test_receive() (gas: 22035)
3940
PassageTest:test_setUp() (gas: 23289)
40-
PassageTest:test_withdraw() (gas: 64486)
41-
RollupPassagePermit2Test:test_exitTokenPermit2() (gas: 135717)
41+
PassageTest:test_withdraw() (gas: 64612)
42+
RollupPassagePermit2Test:test_exitTokenPermit2() (gas: 135843)
4243
RollupPassageTest:test_exit() (gas: 23114)
43-
RollupPassageTest:test_exitToken() (gas: 53266)
44-
RollupPassageTest:test_fallback() (gas: 20910)
45-
RollupPassageTest:test_receive() (gas: 20393)
46-
TransactFuzzTest:test_configureGas(uint256,uint256) (runs: 263, μ: 27720, ~: 27867)
47-
TransactFuzzTest:test_enterTransact_defaultChain_emitsEnter(uint256,address,address,bytes,uint256,uint256,uint256,uint256) (runs: 259, μ: 70500, ~: 70928)
48-
TransactFuzzTest:test_enterTransact_emitsEnter(uint256,address,bytes,uint256,uint256,uint256,uint256) (runs: 258, μ: 70248, ~: 70379)
49-
TransactFuzzTest:test_enterTransact_emitsTransact(uint256,address,bytes,uint256,uint256,uint256,uint256) (runs: 258, μ: 70527, ~: 70634)
50-
TransactFuzzTest:test_onlyGasAdmin(address,uint256,uint256) (runs: 263, μ: 12907, ~: 12907)
51-
TransactFuzzTest:test_transact(uint256,address,address,bytes,uint256,uint256,uint256) (runs: 259, μ: 51022, ~: 51391)
52-
TransactFuzzTest:test_transactWithValue_defaultChain_emitsEnter(address,bytes,uint256,uint256,uint256,uint256) (runs: 259, μ: 71790, ~: 72071)
53-
TransactFuzzTest:test_transactWithValue_defaultChain_emitsTransact(address,bytes,uint256,uint256,uint256,uint256) (runs: 259, μ: 72158, ~: 72413)
54-
TransactFuzzTest:test_transactWithValue_defaultChain_emitsTransact(uint256,address,address,bytes,uint256,uint256,uint256,uint256) (runs: 259, μ: 70763, ~: 71159)
55-
TransactFuzzTest:test_transact_defaultChain(address,address,bytes,uint256,uint256,uint256) (runs: 259, μ: 52896, ~: 53103)
56-
TransactFuzzTest:test_transact_perTransactGasLimit(uint256,address,bytes,uint256,uint256,uint256) (runs: 261, μ: 15980, ~: 15980)
44+
RollupPassageTest:test_exitToken() (gas: 53367)
45+
RollupPassageTest:test_fallback() (gas: 20654)
46+
RollupPassageTest:test_receive() (gas: 20206)
47+
TransactFuzzTest:test_configureGas(uint256,uint256) (runs: 267, μ: 27723, ~: 27867)
48+
TransactFuzzTest:test_enterTransact_defaultChain_emitsEnter(uint256,address,address,bytes,uint256,uint256,uint256,uint256) (runs: 260, μ: 70502, ~: 70928)
49+
TransactFuzzTest:test_enterTransact_emitsEnter(uint256,address,bytes,uint256,uint256,uint256,uint256) (runs: 261, μ: 70250, ~: 70379)
50+
TransactFuzzTest:test_enterTransact_emitsTransact(uint256,address,bytes,uint256,uint256,uint256,uint256) (runs: 261, μ: 70528, ~: 70634)
51+
TransactFuzzTest:test_onlyGasAdmin(address,uint256,uint256) (runs: 267, μ: 12907, ~: 12907)
52+
TransactFuzzTest:test_transact(uint256,address,address,bytes,uint256,uint256,uint256) (runs: 261, μ: 51025, ~: 51391)
53+
TransactFuzzTest:test_transactWithValue_defaultChain_emitsEnter(address,bytes,uint256,uint256,uint256,uint256) (runs: 261, μ: 71793, ~: 72071)
54+
TransactFuzzTest:test_transactWithValue_defaultChain_emitsTransact(address,bytes,uint256,uint256,uint256,uint256) (runs: 261, μ: 72160, ~: 72413)
55+
TransactFuzzTest:test_transactWithValue_defaultChain_emitsTransact(uint256,address,address,bytes,uint256,uint256,uint256,uint256) (runs: 260, μ: 70765, ~: 71159)
56+
TransactFuzzTest:test_transact_defaultChain(address,address,bytes,uint256,uint256,uint256) (runs: 262, μ: 52898, ~: 53103)
57+
TransactFuzzTest:test_transact_perTransactGasLimit(uint256,address,bytes,uint256,uint256,uint256) (runs: 262, μ: 15980, ~: 15980)
5758
TransactTest:test_configureGas() (gas: 27486)
5859
TransactTest:test_enterTransact() (gas: 127464)
5960
TransactTest:test_onlyGasAdmin() (gas: 9895)
@@ -64,9 +65,9 @@ TransactTest:test_transact_globalGasLimit() (gas: 117828)
6465
TransactTest:test_transact_perTransactGasLimit() (gas: 34574)
6566
ZenithFuzzTest:test_addSequencer(uint256,(uint256,uint256,uint256,address,bytes32),bytes) (runs: 256, μ: 90812, ~: 90812)
6667
ZenithFuzzTest:test_badSignature((uint256,uint256,uint256,address,bytes32),(uint256,uint256,uint256,address,bytes32),bytes) (runs: 256, μ: 40335, ~: 40334)
67-
ZenithFuzzTest:test_incorrectHostBlock((uint256,uint256,uint256,address,bytes32),bytes) (runs: 263, μ: 22120, ~: 22115)
68+
ZenithFuzzTest:test_incorrectHostBlock((uint256,uint256,uint256,address,bytes32),bytes) (runs: 267, μ: 22120, ~: 22115)
6869
ZenithFuzzTest:test_notSequencer(uint256,(uint256,uint256,uint256,address,bytes32),bytes) (runs: 256, μ: 32184, ~: 32183)
69-
ZenithFuzzTest:test_notSequencerAdmin(address,address) (runs: 263, μ: 14423, ~: 14423)
70+
ZenithFuzzTest:test_notSequencerAdmin(address,address) (runs: 267, μ: 14423, ~: 14423)
7071
ZenithFuzzTest:test_submitBlock((uint256,uint256,uint256,address,bytes32),bytes) (runs: 256, μ: 61351, ~: 61351)
7172
ZenithTest:test_addSequencer() (gas: 98616)
7273
ZenithTest:test_badSignature() (gas: 46355)

‎test/fuzz-host/PassageFuzz.t.sol‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ contract PassageFuzzTest is SignetStdTest {
3838
// mint WETH by sending ETH
3939
payable(configuredToken).sendValue(10000 ether);
4040
TestERC20(configuredToken).approve(address(target), 10000 ether);
41-
42-
// // deploy new token that's not configured on Passage
43-
// newToken = address(new TestERC20("bye", "BYE", 18));
44-
// TestERC20(newToken).mint(address(this), amount * 10000);
45-
// TestERC20(newToken).approve(address(target), amount * 10000);
4641
}
4742

4843
// only the token admin can add or remove new tokens from Passage
@@ -59,11 +54,17 @@ contract PassageFuzzTest is SignetStdTest {
5954
target.withdraw(token, recipient, amount);
6055
}
6156

62-
// function test_disallowedEnter(address recipient, address newToken, uint256 amount) public {
63-
// vm.assume(target.canEnter(newToken) == false);
64-
// vm.expectRevert(abi.encodeWithSelector(Passage.DisallowedEnter.selector, newToken));
65-
// target.enterToken(recipient, newToken, amount);
66-
// }
57+
function test_disallowedEnter(address recipient, address newToken, uint256 amount) public {
58+
vm.assume(amount > 0);
59+
vm.assume(target.canEnter(newToken) == false);
60+
vm.mockCall(
61+
newToken,
62+
abi.encodeWithSelector(IERC20.transferFrom.selector, address(this), address(target), amount),
63+
abi.encode(true)
64+
);
65+
vm.expectRevert(abi.encodeWithSelector(Passage.DisallowedEnter.selector, newToken));
66+
target.enterToken(recipient, newToken, amount);
67+
}
6768

6869
function test_receive(uint256 amount) public {
6970
vm.assume(amount > 0 && amount < payable(address(this)).balance);

0 commit comments

Comments
 (0)