chore: forge fmt

liquity · Dec 10, 2024 · 8e59292 · 8e59292
1 parent 91d4bba
commit 8e59292
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/contracts/src/PriceFeeds/WETHPriceFeed.sol b/contracts/src/PriceFeeds/WETHPriceFeed.sol
@@ -33,7 +33,7 @@ contract WETHPriceFeed is MainnetPriceFeedBase {
     //  _fetchPricePrimary returns:
     // - The price
     // - A bool indicating whether a new oracle failure was detected in the call
-    function _fetchPricePrimary(bool /* _isRedemption */) internal virtual returns (uint256, bool) {
+    function _fetchPricePrimary(bool /* _isRedemption */ ) internal virtual returns (uint256, bool) {
         return _fetchPricePrimary();
     }
 

diff --git a/contracts/src/Zappers/GasCompZapper.sol b/contracts/src/Zappers/GasCompZapper.sol
@@ -243,11 +243,8 @@ contract GasCompZapper is BaseZapper {
     function closeTroveFromCollateral(uint256 _troveId, uint256 _flashLoanAmount) external override {
         address owner = troveNFT.ownerOf(_troveId);
         address payable receiver = payable(_requireSenderIsOwnerOrRemoveManagerAndGetReceiver(_troveId, owner));
-        CloseTroveParams memory params = CloseTroveParams({
-            troveId: _troveId,
-            flashLoanAmount: _flashLoanAmount,
-            receiver: receiver
-        });
+        CloseTroveParams memory params =
+            CloseTroveParams({troveId: _troveId, flashLoanAmount: _flashLoanAmount, receiver: receiver});
 
         // Set initial balances to make sure there are not lefovers
         InitialBalances memory initialBalances;

diff --git a/contracts/src/Zappers/WETHZapper.sol b/contracts/src/Zappers/WETHZapper.sol
@@ -241,11 +241,8 @@ contract WETHZapper is BaseZapper {
     function closeTroveFromCollateral(uint256 _troveId, uint256 _flashLoanAmount) external override {
         address owner = troveNFT.ownerOf(_troveId);
         address payable receiver = payable(_requireSenderIsOwnerOrRemoveManagerAndGetReceiver(_troveId, owner));
-        CloseTroveParams memory params = CloseTroveParams({
-            troveId: _troveId,
-            flashLoanAmount: _flashLoanAmount,
-            receiver: receiver
-            });
+        CloseTroveParams memory params =
+            CloseTroveParams({troveId: _troveId, flashLoanAmount: _flashLoanAmount, receiver: receiver});
 
         // Set initial balances to make sure there are not lefovers
         InitialBalances memory initialBalances;

diff --git a/contracts/src/test/shutdown.t.sol b/contracts/src/test/shutdown.t.sol
@@ -413,7 +413,9 @@ contract ShutdownTest is DevTestSetup {
         assertEq(boldToken.balanceOf(A), boldBalanceBefore - redemptionAmount, "Bold balance mismatch");
         assertEq(
             contractsArray[0].collToken.balanceOf(A),
-            collBalanceBefore + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS) / DECIMAL_PRECISION,
+            collBalanceBefore
+                + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS)
+                    / DECIMAL_PRECISION,
             "Coll balance mismatch"
         );
     }
@@ -440,7 +442,8 @@ contract ShutdownTest is DevTestSetup {
 
         assertEq(
             boldToken.balanceOf(A),
-            boldBalanceBefore - 11e18 * price / DECIMAL_PRECISION * DECIMAL_PRECISION / (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS),
+            boldBalanceBefore
+                - 11e18 * price / DECIMAL_PRECISION * DECIMAL_PRECISION / (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS),
             "Bold balance mismatch"
         );
         assertEq(contractsArray[0].collToken.balanceOf(A), collBalanceBefore + 11e18, "Coll balance mismatch");
@@ -470,7 +473,9 @@ contract ShutdownTest is DevTestSetup {
         assertEq(boldToken.balanceOf(A), boldBalanceBefore - redemptionAmount, "Bold balance mismatch");
         assertEq(
             contractsArray[0].collToken.balanceOf(A),
-            collBalanceBefore + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS) / DECIMAL_PRECISION,
+            collBalanceBefore
+                + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS)
+                    / DECIMAL_PRECISION,
             "Coll balance mismatch"
         );
     }
@@ -500,7 +505,9 @@ contract ShutdownTest is DevTestSetup {
         // TODO: determine why this is off by 1 wei - it should be exact
         assertApproximatelyEqual(
             contractsArray[0].collToken.balanceOf(A),
-            collBalanceBefore + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS) / DECIMAL_PRECISION,
+            collBalanceBefore
+                + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS)
+                    / DECIMAL_PRECISION,
             1, // 1 wei tolerance
             "Coll balance mismatch"
         );
@@ -529,7 +536,9 @@ contract ShutdownTest is DevTestSetup {
         assertEq(boldToken.balanceOf(A), boldBalanceBefore - redemptionAmount, "Bold balance mismatch");
         assertEq(
             contractsArray[0].collToken.balanceOf(A),
-            collBalanceBefore + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS) / DECIMAL_PRECISION,
+            collBalanceBefore
+                + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS)
+                    / DECIMAL_PRECISION,
             "Coll balance mismatch"
         );
     }
@@ -558,7 +567,9 @@ contract ShutdownTest is DevTestSetup {
         // TODO: determine why this is off by 1 wei - it should be exact
         assertApproximatelyEqual(
             contractsArray[0].collToken.balanceOf(A),
-            collBalanceBefore + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS) / DECIMAL_PRECISION,
+            collBalanceBefore
+                + redemptionAmount * DECIMAL_PRECISION / price * (DECIMAL_PRECISION + URGENT_REDEMPTION_BONUS)
+                    / DECIMAL_PRECISION,
             1, // 1 wei tolerance
             "Coll balance mismatch"
         );

diff --git a/contracts/src/test/zapperLeverage.t.sol b/contracts/src/test/zapperLeverage.t.sol
@@ -1627,7 +1627,8 @@ contract ZapperLeverageMainnet is DevTestSetup {
         tokens[0] = contractsArray[_branch].collToken;
         uint256[] memory amounts = new uint256[](1);
         amounts[0] = flashLoanAmount;
-        bytes memory userData = abi.encode(address(_zapper), IFlashLoanProvider.Operation.CloseTrove, troveId, flashLoanAmount);
+        bytes memory userData =
+            abi.encode(address(_zapper), IFlashLoanProvider.Operation.CloseTrove, troveId, flashLoanAmount);
         IVault vault = IVault(0xBA12222222228d8Ba445958a75a0704d566BF2C8);
         vm.startPrank(B);
         vm.expectRevert("Flash loan not properly initiated");