fix test #913
Merged
fix test #913
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wjmelements
approved these changes
Oct 29, 2024
hensha256
reviewed
Oct 29, 2024
test/libraries/Pool.t.sol
Outdated
| @@ -119,9 +119,12 @@ contract PoolTest is Test { | |||
| assertEq(slot0.protocolFee(), 0); | |||
| slot0 = slot0.setProtocolFee(protocolFee); | |||
| assertEq(slot0.protocolFee(), protocolFee); | |||
| state.slot0 = slot0; | |||
|
|
|||
| uint16 pFee = params.zeroForOne ? protocolFee0 : protocolFee1; | |||
There was a problem hiding this comment.
i dont like pFee 😆 can we rename it something more descriptive? Or rename protocolFee and call this one protocolFee?
There was a problem hiding this comment.
swapProtocolFee? finalProtocolFee? expectedProtocolFee?
hensha256
approved these changes
Oct 29, 2024
hensha256
previously approved these changes
Oct 29, 2024
wjmelements
reviewed
Oct 29, 2024
test/libraries/Pool.t.sol
Outdated
|
|
||
| uint24 _lpFee = params.lpFeeOverride.isOverride() ? params.lpFeeOverride.removeOverrideFlag() : lpFee; | ||
| uint24 swapFee = protocolFee == 0 ? _lpFee : pFee.calculateSwapFee(_lpFee); | ||
| uint24 swapFee = protocolFee == 0 ? _lpFee : expectedProtocolFee.calculateSwapFee(_lpFee); |
There was a problem hiding this comment.
should it be
uint24 swapFee = expectedProtocolFee == 0 ? _lpFee : expectedProtocolFee.calculateSwapFee(_lpFee);
There was a problem hiding this comment.
based on
swapFee = protocolFee == 0 ? lpFee : uint16(protocolFee).calculateSwapFee(lpFee);
There was a problem hiding this comment.
mmmm yes i believe so, good catch
hensha256
approved these changes
Oct 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue
Which issue does this pull request resolve?
Description of changes