Skip to content

Commit

Permalink
remove cast
Browse files Browse the repository at this point in the history
  • Loading branch information
@snreynolds
snreynolds committed Oct 18, 2024
1 parent 32430ad commit e82c4ec
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions test/DynamicFees.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {

dynamicFeesHooks.setFee(999999);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, 1000);

IPoolManager.SwapParams memory params =
Expand All @@ -245,7 +245,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {

dynamicFeesHooks.setFee(1000000);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, 1000);

IPoolManager.SwapParams memory params =
Expand All @@ -267,7 +267,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {

dynamicFeesHooks.setFee(123);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, 1000);

PoolSwapTest.TestSettings memory testSettings =
Expand All @@ -294,7 +294,7 @@ contract TestDynamicFees is Test, Deployers, GasSnapshot {
uint24 protocolFee = (uint24(protocolFee1) << 12) | uint24(protocolFee0);
dynamicFeesHooks.setFee(lpFee);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, protocolFee);

IPoolManager.SwapParams memory params = IPoolManager.SwapParams({
Expand Down
22 changes: 11 additions & 11 deletions test/PoolManager.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(key.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, protocolFee);

(,, slot0ProtocolFee,) = manager.getSlot0(key.toId());
Expand Down Expand Up @@ -989,7 +989,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(key.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, MAX_PROTOCOL_FEE_BOTH_TOKENS);

(,, slot0ProtocolFee,) = manager.getSlot0(key.toId());
Expand All @@ -1005,7 +1005,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(currency0.balanceOf(address(1)), 0);
vm.prank(address(feeController));
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency0, expectedFees);
snapLastCall("erc20 collect protocol fees");
assertEq(currency0.balanceOf(address(1)), expectedFees);
Expand All @@ -1018,7 +1018,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(key.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, MAX_PROTOCOL_FEE_BOTH_TOKENS);

(,, slot0ProtocolFee,) = manager.getSlot0(key.toId());
Expand All @@ -1034,7 +1034,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
assertEq(manager.protocolFeesAccrued(currency0), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(currency0.balanceOf(address(1)), 0);
vm.prank(address(feeController));
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency0, expectedFees);
assertEq(currency0.balanceOf(address(1)), expectedFees);
assertEq(manager.protocolFeesAccrued(currency0), 0);
Expand All @@ -1046,7 +1046,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(key.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(key, MAX_PROTOCOL_FEE_BOTH_TOKENS);

(,, slot0ProtocolFee,) = manager.getSlot0(key.toId());
Expand All @@ -1062,7 +1062,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
assertEq(manager.protocolFeesAccrued(currency0), 0);
assertEq(manager.protocolFeesAccrued(currency1), expectedFees);
assertEq(currency1.balanceOf(address(1)), 0);
vm.prank(address(feeController));
vm.prank(feeController);
manager.collectProtocolFees(address(1), currency1, 0);
assertEq(currency1.balanceOf(address(1)), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
Expand All @@ -1075,7 +1075,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(nativeKey.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(nativeKey, MAX_PROTOCOL_FEE_BOTH_TOKENS);

(,, slot0ProtocolFee,) = manager.getSlot0(nativeKey.toId());
Expand All @@ -1091,7 +1091,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(nativeCurrency.balanceOf(address(1)), 0);
vm.prank(address(feeController));
vm.prank(feeController);
manager.collectProtocolFees(address(1), nativeCurrency, expectedFees);
snapLastCall("native collect protocol fees");
assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
Expand All @@ -1105,7 +1105,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
(,, uint24 slot0ProtocolFee,) = manager.getSlot0(nativeKey.toId());
assertEq(slot0ProtocolFee, 0);

vm.prank(address(feeController));
vm.prank(feeController);
manager.setProtocolFee(nativeKey, MAX_PROTOCOL_FEE_BOTH_TOKENS);

(,, slot0ProtocolFee,) = manager.getSlot0(nativeKey.toId());
Expand All @@ -1121,7 +1121,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
assertEq(manager.protocolFeesAccrued(nativeCurrency), expectedFees);
assertEq(manager.protocolFeesAccrued(currency1), 0);
assertEq(nativeCurrency.balanceOf(address(1)), 0);
vm.prank(address(feeController));
vm.prank(feeController);
manager.collectProtocolFees(address(1), nativeCurrency, 0);
assertEq(nativeCurrency.balanceOf(address(1)), expectedFees);
assertEq(manager.protocolFeesAccrued(nativeCurrency), 0);
Expand Down
18 changes: 9 additions & 9 deletions test/ProtocolFeesImplementation.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
function test_setProtocolFeeController_succeedsNoRevert() public {
assertEq(address(protocolFees.protocolFeeController()), address(0));
vm.expectEmit(true, false, false, false, address(protocolFees));
emit ProtocolFeeControllerUpdated(address(feeController));
emit ProtocolFeeControllerUpdated(feeController);
protocolFees.setProtocolFeeController(feeController);
assertEq(address(protocolFees.protocolFeeController()), address(feeController));
assertEq(address(protocolFees.protocolFeeController()), feeController);
}

function test_setProtocolFeeController_revertsWithNotAuthorized() public {
Expand All @@ -54,7 +54,7 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
protocolFees.setProtocolFeeController(feeController);
// Set price to pretend that the pool is initialized
protocolFees.setPrice(key, Constants.SQRT_PRICE_1_1);
vm.prank(address(feeController));
vm.prank(feeController);
vm.expectEmit(true, false, false, true, address(protocolFees));
emit ProtocolFeeUpdated(key.toId(), MAX_PROTOCOL_FEE_BOTH_TOKENS);
protocolFees.setProtocolFee(key, MAX_PROTOCOL_FEE_BOTH_TOKENS);
Expand All @@ -71,12 +71,12 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
uint24 protocolFee = MAX_PROTOCOL_FEE_BOTH_TOKENS + 1;

protocolFees.setProtocolFeeController(feeController);
vm.prank(address(feeController));
vm.prank(feeController);
vm.expectRevert(abi.encodeWithSelector(IProtocolFees.ProtocolFeeTooLarge.selector, protocolFee));
protocolFees.setProtocolFee(key, protocolFee);

protocolFee = MAX_PROTOCOL_FEE_BOTH_TOKENS + (1 << 12);
vm.prank(address(feeController));
vm.prank(feeController);
vm.expectRevert(abi.encodeWithSelector(IProtocolFees.ProtocolFeeTooLarge.selector, protocolFee));
protocolFees.setProtocolFee(key, protocolFee);
}
Expand All @@ -87,7 +87,7 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
protocolFees.setPrice(key, Constants.SQRT_PRICE_1_1);
uint16 fee0 = protocolFee.getZeroForOneFee();
uint16 fee1 = protocolFee.getOneForZeroFee();
vm.prank(address(feeController));
vm.prank(feeController);
if ((fee0 > 1000) || (fee1 > 1000)) {
vm.expectRevert(abi.encodeWithSelector(IProtocolFees.ProtocolFeeTooLarge.selector, protocolFee));
protocolFees.setProtocolFee(key, protocolFee);
Expand All @@ -107,7 +107,7 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
protocolFees.setIsUnlocked(true);

protocolFees.setProtocolFeeController(feeController);
vm.prank(address(feeController));
vm.prank(feeController);

vm.expectRevert(IProtocolFees.ContractUnlocked.selector);
protocolFees.collectProtocolFees(address(1), currency0, 0);
Expand All @@ -119,7 +119,7 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
assertEq(protocolFees.protocolFeesAccrued(currency0), 100);

protocolFees.setProtocolFeeController(feeController);
vm.prank(address(feeController));
vm.prank(feeController);
protocolFees.collectProtocolFees(address(this), currency0, 100);
assertEq(protocolFees.protocolFeesAccrued(currency0), 0);
assertEq(currency0.balanceOf(address(this)), 100);
Expand All @@ -139,7 +139,7 @@ contract ProtocolFeesTest is Test, GasSnapshot, Deployers {
}

protocolFees.setProtocolFeeController(feeController);
vm.prank(address(feeController));
vm.prank(feeController);
if (amount > feesAccrued) {
vm.expectRevert();
}
Expand Down

0 comments on commit e82c4ec

Please sign in to comment.