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

test updates #932

Merged
merged 4 commits into from
Jan 21, 2025
Merged

test updates #932

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70743a1
fix fork tests
snreynolds Jan 21, 2025
492fd3e
allow fork cheatcodes
hensha256 Jan 21, 2025
a7b12c2
pr feedback yee
saucepoint Jan 21, 2025
ec13bf0
woohoo
dianakocsis Jan 21, 2025
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 snapshots/PoolManagerTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"addLiquidity with native token": "135001",
"donate gas with 1 token": "106214",
"donate gas with 2 tokens": "145510",
"erc20 collect protocol fees": "57500",
"native collect protocol fees": "59643",
"erc20 collect protocol fees": "57536",
"native collect protocol fees": "59179",
"poolManager bytecode size": "24009",
"poolManager initcode hash (without constructor params, as uint256)": "19281018184167079101887460999643277467915809731640262058315305465805214934776",
"removeLiquidity with empty hook": "130613",
Expand Down
32 changes: 17 additions & 15 deletions test/PoolManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ contract PoolManagerTest is Test, Deployers {

uint24 constant MAX_PROTOCOL_FEE_BOTH_TOKENS = (1000 << 12) | 1000; // 1000 1000

address recipientAddress = address(123456789);

function setUp() public {
initializeManagerRoutersAndPoolsWithLiq(IHooks(address(0)));

Expand Down Expand Up @@ -1057,11 +1059,11 @@ contract PoolManagerTest is Test, Deployers {

assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(currency0.balanceOf(address(1)), 0);
assertEq(currency0.balanceOf(recipientAddress), 0);
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency0, expectedFees);
manager.collectProtocolFees(recipientAddress, currency0, expectedFees);
vm.snapshotGasLastCall("erc20 collect protocol fees");
assertEq(currency0.balanceOf(address(1)), expectedFees);
assertEq(currency0.balanceOf(recipientAddress), expectedFees);
assertEq(manager.protocolFeesAccrued(currency0), 0);
}

Expand All @@ -1086,10 +1088,10 @@ contract PoolManagerTest is Test, Deployers {

assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(currency0.balanceOf(address(1)), 0);
assertEq(currency0.balanceOf(recipientAddress), 0);
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency0, expectedFees);
assertEq(currency0.balanceOf(address(1)), expectedFees);
manager.collectProtocolFees(recipientAddress, currency0, expectedFees);
assertEq(currency0.balanceOf(recipientAddress), expectedFees);
assertEq(manager.protocolFeesAccrued(currency0), 0);
}

Expand All @@ -1114,10 +1116,10 @@ contract PoolManagerTest is Test, Deployers {

assertEq(manager.protocolFeesAccrued(currency0), 0);
assertEq(manager.protocolFeesAccrued(currency1), expectedFees);
assertEq(currency1.balanceOf(address(1)), 0);
assertEq(currency1.balanceOf(recipientAddress), 0);
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency1, 0);
assertEq(currency1.balanceOf(address(1)), expectedFees);
manager.collectProtocolFees(recipientAddress, currency1, 0);
assertEq(currency1.balanceOf(recipientAddress), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
}

Expand All @@ -1143,11 +1145,11 @@ contract PoolManagerTest is Test, Deployers {

assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(nativeCurrency.balanceOf(address(1)), 0);
assertEq(nativeCurrency.balanceOf(recipientAddress), 0);
vm.prank(feeController);
manager.collectProtocolFees(address(1), nativeCurrency, expectedFees);
manager.collectProtocolFees(recipientAddress, nativeCurrency, expectedFees);
vm.snapshotGasLastCall("native collect protocol fees");
assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
assertEq(nativeCurrency.balanceOf(recipientAddress), expectedFees);
assertEq(manager.protocolFeesAccrued(nativeCurrency), 0);
}

Expand All @@ -1173,10 +1175,10 @@ contract PoolManagerTest is Test, Deployers {

assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(nativeCurrency.balanceOf(address(1)), 0);
assertEq(nativeCurrency.balanceOf(recipientAddress), 0);
vm.prank(feeController);
manager.collectProtocolFees(address(1), nativeCurrency, 0);
assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
manager.collectProtocolFees(recipientAddress, nativeCurrency, 0);
assertEq(nativeCurrency.balanceOf(recipientAddress), expectedFees);
assertEq(manager.protocolFeesAccrued(nativeCurrency), 0);
}

Expand Down
1 change: 1 addition & 0 deletions test/SkipCallsTestHook.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ contract SkipCallsTest is Test, Deployers {

function deploy(SkipCallsTestHook skipCallsTestHook) private {
SkipCallsTestHook impl = new SkipCallsTestHook();
vm.allowCheatcodes(address(skipCallsTestHook));
vm.etch(address(skipCallsTestHook), address(impl).code);
deployFreshManagerAndRouters();
skipCallsTestHook.setManager(IPoolManager(manager));
Expand Down
2 changes: 1 addition & 1 deletion test/types/Currency.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {CustomRevert} from "../../src/libraries/CustomRevert.sol";

contract TestCurrency is Test {
uint256 constant initialERC20Balance = 1000 ether;
address constant otherAddress = address(1);
address constant otherAddress = address(123456789);

Currency nativeCurrency;
Currency erc20Currency;
Expand Down
Loading