format; update test_InitialState

metalogica · Nov 13, 2024 · bbd5fdc · bbd5fdc
1 parent f489b8f
commit bbd5fdc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 39 deletions.
diff --git a/script/LMSR.s.sol b/script/LMSR.s.sol
@@ -34,11 +34,7 @@ contract DeployLMSR is Script {
         }
 
         // Deploy LMSR Market
-        market = new LMSRMarket(
-            block.chainid == 31337 ? address(usdc) : getUSDCAddress(),
-            LIQUIDITY,
-            NUM_OUTCOMES
-        );
+        market = new LMSRMarket(block.chainid == 31337 ? address(usdc) : getUSDCAddress(), LIQUIDITY, NUM_OUTCOMES);
 
         console.log("Deployed LMSR Market at:", address(market));
         console.log("USDC address:", address(market.USDC()));

diff --git a/src/LMSR.sol b/src/LMSR.sol
@@ -49,19 +49,9 @@ contract LMSRMarket is ReentrancyGuard {
                                 EVENTS
     //////////////////////////////////////////////////////////////*/
 
-    event SharesPurchased(
-        address indexed buyer,
-        uint256 indexed outcome,
-        uint256 amount,
-        uint256 usdcCost
-    );
-
-    event SharesSold(
-        address indexed seller,
-        uint256 indexed outcome,
-        uint256 amount,
-        uint256 usdcPayout
-    );
+    event SharesPurchased(address indexed buyer, uint256 indexed outcome, uint256 amount, uint256 usdcCost);
+
+    event SharesSold(address indexed seller, uint256 indexed outcome, uint256 amount, uint256 usdcPayout);
 
     event MarketResolved(uint256 indexed outcome);
 
@@ -92,10 +82,7 @@ contract LMSRMarket is ReentrancyGuard {
                             CORE FUNCTIONS
     //////////////////////////////////////////////////////////////*/
 
-    function calculateCost(
-        uint256 outcome,
-        uint256 amount
-    ) public view returns (uint256 cost) {
+    function calculateCost(uint256 outcome, uint256 amount) public view returns (uint256 cost) {
         if (outcome >= numOutcomes) revert InvalidOutcome();
         if (amount < MIN_AMOUNT) revert AmountTooSmall();
 
@@ -143,12 +130,14 @@ contract LMSRMarket is ReentrancyGuard {
 
     function claimWinnings(uint256 amount) external nonReentrant {
         if (!resolved) revert MarketNotResolved();
-        if (userShares[msg.sender][winningOutcome] < amount)
+        if (userShares[msg.sender][winningOutcome] < amount) {
             revert InsufficientShares();
+        }
 
         uint256 usdcAmount = (amount * SCALE) / (10 ** (18 - USDC_DECIMALS));
-        if (usdcAmount > USDC.balanceOf(address(this)))
+        if (usdcAmount > USDC.balanceOf(address(this))) {
             revert InsufficientUSDC();
+        }
 
         userShares[msg.sender][winningOutcome] -= amount;
         quantities[winningOutcome] -= amount;
@@ -164,20 +153,15 @@ contract LMSRMarket is ReentrancyGuard {
                             VIEW FUNCTIONS
     //////////////////////////////////////////////////////////////*/
 
-    function getUserPosition(
-        address user,
-        uint256 outcome
-    ) external view returns (uint256) {
+    function getUserPosition(address user, uint256 outcome) external view returns (uint256) {
         return userShares[user][outcome];
     }
 
     /*//////////////////////////////////////////////////////////////
                         INTERNAL FUNCTIONS
     //////////////////////////////////////////////////////////////*/
 
-    function calculateLMSRCost(
-        uint256[] memory _quantities
-    ) internal view returns (uint256) {
+    function calculateLMSRCost(uint256[] memory _quantities) internal view returns (uint256) {
         uint256 sum = 0;
         for (uint256 i = 0; i < numOutcomes; i++) {
             sum += exp((_quantities[i] * SCALE) / liquidity);

diff --git a/test/ERC20.m.sol b/test/ERC20.m.sol
@@ -10,11 +10,7 @@ contract MockERC20 is ERC20 {
     bool public transferShouldRevert;
     bool public mintShouldRevert;
 
-    constructor(
-        string memory name,
-        string memory symbol,
-        uint8 decimals_
-    ) ERC20(name, symbol) {
+    constructor(string memory name, string memory symbol, uint8 decimals_) ERC20(name, symbol) {
         _decimals = decimals_;
     }
 

diff --git a/test/LMSR.t.sol b/test/LMSR.t.sol
@@ -36,7 +36,7 @@ contract LMSRMarketTest is Test {
         vm.stopPrank();
     }
 
-    function test_InitialState() public {
+    function test_InitialState() public view {
         assertEq(market.numOutcomes(), NUM_OUTCOMES);
         assertEq(market.liquidity(), LIQUIDITY);
         assertEq(address(market.USDC()), address(usdc));
@@ -85,8 +85,7 @@ contract LMSRMarketTest is Test {
         uint256 balanceBefore = usdc.balanceOf(alice);
         market.claimWinnings(amount);
 
-        uint256 expectedPayout = (amount * market.SCALE()) /
-            (10 ** (18 - market.USDC_DECIMALS()));
+        uint256 expectedPayout = (amount * market.SCALE()) / (10 ** (18 - market.USDC_DECIMALS()));
         assertEq(usdc.balanceOf(alice), balanceBefore + expectedPayout);
         assertEq(market.getUserPosition(alice, outcome), 0);
     }