Run forge fmt

derivexyz · Aug 16, 2024 · b56401f · b56401f
1 parent 52ec133
commit b56401f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -8,8 +8,6 @@ fs_permissions = [{ access = "read-write", path = "./"}]
 
 solc_version="0.8.18"
 
-evm_version="shanghai"
-
 [fmt]
 line_length = 120
 tab_width = 2

diff --git a/src/risk-managers/PMRMLib.sol b/src/risk-managers/PMRMLib.sol
@@ -35,11 +35,10 @@ contract PMRMLib is IPMRMLib, Ownable2Step {
 
   function setBasisContingencyParams(IPMRMLib.BasisContingencyParameters memory _basisContParams) external onlyOwner {
     if (
+      //
       _basisContParams.scenarioSpotUp <= 1e18 || _basisContParams.scenarioSpotUp > 3e18
         || _basisContParams.scenarioSpotDown >= 1e18 //
-        || _basisContParams.basisContMultFactor > 5e18
-      //
-      || _basisContParams.basisContAddFactor > 5e18
+        || _basisContParams.basisContMultFactor > 5e18 || _basisContParams.basisContAddFactor > 5e18
     ) {
       revert PMRML_InvalidBasisContingencyParameters();
     }

diff --git a/test/integration-tests/liquidation/PM_liquidationSimTests.t.sol b/test/integration-tests/liquidation/PM_liquidationSimTests.t.sol
@@ -88,9 +88,8 @@ contract LiquidationSimTests_PM is LiquidationSimBase {
     if (auctionDetails.insolvent) {
       // todo: this needs to be changed to use MM as lower bound
       // assertApproxEqAbs(mm, data.Actions[actionId].Results.LowerBound, 1e6, "lowerbound");
-    } else {
-      fMax = auction.getMaxProportion(aliceAcc, worstScenario);
     }
+    else fMax = auction.getMaxProportion(aliceAcc, worstScenario);
 
     assertApproxEqAbs(mtm, data.Actions[actionId].Results.PreMtM, 1e6, "pre mtm");
     assertApproxEqAbs(mm, data.Actions[actionId].Results.PreMM, 1e6, "pre mm");
@@ -107,7 +106,8 @@ contract LiquidationSimTests_PM is LiquidationSimBase {
     assertApproxEqAbs(bm, data.Actions[actionId].Results.PostBM, 1e6, "post bm");
 
     IDutchAuction.Auction memory auctionDetails = auction.getAuction(aliceAcc);
-    if (auctionDetails.insolvent) {} else {
+    if (auctionDetails.insolvent) {}
+    else {
       uint fMax = auction.getMaxProportion(aliceAcc, worstScenario);
       assertApproxEqAbs(fMax, data.Actions[actionId].Results.PostFMax, 1e6, "post fmax");
     }