Skip to content

Commit e6980eb

Browse files
committed
Fix formatting to match CI/CD forge fmt requirements
1 parent d515a2b commit e6980eb

2 files changed

Lines changed: 17 additions & 39 deletions

File tree

src/EIP712Swap.sol

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ contract EIP712Swap is EIP712 {
1111

1212
mapping(address => uint256) private _nonces;
1313

14-
bytes32 private constant SWAP_TYPEHASH =
15-
keccak256(
16-
"SwapRequest(address pool,address sender,address tokenIn,address tokenOut,uint256 amountIn,uint256 minAmountOut,uint256 nonce,uint256 deadline)"
17-
);
14+
bytes32 private constant SWAP_TYPEHASH = keccak256(
15+
"SwapRequest(address pool,address sender,address tokenIn,address tokenOut,uint256 amountIn,uint256 minAmountOut,uint256 nonce,uint256 deadline)"
16+
);
1817

1918
error InvalidSignature();
2019
error ExpiredSwapRequest();
@@ -30,10 +29,7 @@ contract EIP712Swap is EIP712 {
3029
return _nonces[_sender];
3130
}
3231

33-
function verify(
34-
ISwap.SwapRequest memory _swapRequest,
35-
bytes memory _signature
36-
) public view returns (bool) {
32+
function verify(ISwap.SwapRequest memory _swapRequest, bytes memory _signature) public view returns (bool) {
3733
bytes32 digest = _hashTypedDataV4(
3834
keccak256(
3935
abi.encode(
@@ -53,10 +49,7 @@ contract EIP712Swap is EIP712 {
5349
return signer == _swapRequest.sender;
5450
}
5551

56-
function executeSwap(
57-
ISwap.SwapRequest memory _swapRequest,
58-
bytes memory _signature
59-
) public returns (bool) {
52+
function executeSwap(ISwap.SwapRequest memory _swapRequest, bytes memory _signature) public returns (bool) {
6053
if (!verify(_swapRequest, _signature)) revert InvalidSignature();
6154
if (_swapRequest.deadline < block.timestamp) {
6255
revert ExpiredSwapRequest();
@@ -66,13 +59,14 @@ contract EIP712Swap is EIP712 {
6659
}
6760

6861
_nonces[_swapRequest.sender]++;
69-
LiquidityPool(_swapRequest.pool).swap(
70-
_swapRequest.sender,
71-
_swapRequest.tokenIn,
72-
_swapRequest.tokenOut,
73-
_swapRequest.amountIn,
74-
_swapRequest.minAmountOut
75-
);
62+
LiquidityPool(_swapRequest.pool)
63+
.swap(
64+
_swapRequest.sender,
65+
_swapRequest.tokenIn,
66+
_swapRequest.tokenOut,
67+
_swapRequest.amountIn,
68+
_swapRequest.minAmountOut
69+
);
7670

7771
return true;
7872
}

test/FeeManager.t.sol

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ contract FeeManagerTest is Test {
5656

5757
function test_GetFee_WithDifferentAmounts() public view {
5858
ISwap.SwapParams memory params = ISwap.SwapParams({
59-
token0: address(0x1),
60-
token1: address(0x2),
61-
amount0: 500e18,
62-
reserveToken0: 5000e18,
63-
reserveToken1: 10000e6
59+
token0: address(0x1), token1: address(0x2), amount0: 500e18, reserveToken0: 5000e18, reserveToken1: 10000e6
6460
});
6561

6662
uint256 fee = feeManager.getFee(params);
@@ -69,11 +65,7 @@ contract FeeManagerTest is Test {
6965

7066
function test_GetFee_ZeroAmount() public view {
7167
ISwap.SwapParams memory params = ISwap.SwapParams({
72-
token0: address(0x1),
73-
token1: address(0x2),
74-
amount0: 0,
75-
reserveToken0: 10000e18,
76-
reserveToken1: 20000e6
68+
token0: address(0x1), token1: address(0x2), amount0: 0, reserveToken0: 10000e18, reserveToken1: 20000e6
7769
});
7870

7971
uint256 fee = feeManager.getFee(params);
@@ -83,11 +75,7 @@ contract FeeManagerTest is Test {
8375
function test_FeeCalculationWithSimpleNumbers() public view {
8476
// Use numbers that result in clean division
8577
ISwap.SwapParams memory params = ISwap.SwapParams({
86-
token0: address(0x1),
87-
token1: address(0x2),
88-
amount0: 1000,
89-
reserveToken0: 10000,
90-
reserveToken1: 10000
78+
token0: address(0x1), token1: address(0x2), amount0: 1000, reserveToken0: 10000, reserveToken1: 10000
9179
});
9280

9381
uint256 fee = feeManager.getFee(params);
@@ -103,11 +91,7 @@ contract FeeManagerTest is Test {
10391
function test_FeeScalesWithAmount() public view {
10492
// Test that larger amounts result in larger fees
10593
ISwap.SwapParams memory smallParams = ISwap.SwapParams({
106-
token0: address(0x1),
107-
token1: address(0x2),
108-
amount0: 100e18,
109-
reserveToken0: 10000e18,
110-
reserveToken1: 10000e6
94+
token0: address(0x1), token1: address(0x2), amount0: 100e18, reserveToken0: 10000e18, reserveToken1: 10000e6
11195
});
11296

11397
// 10x larger

0 commit comments

Comments
 (0)