test: fix G3M allocate tests

primitivefinance · Feb 23, 2024 · 16b9c1a · 16b9c1a
1 parent fbf5acd
commit 16b9c1a
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/src/test/unit/strategies/G3M/Allocate.t.sol b/src/test/unit/strategies/G3M/Allocate.t.sol
@@ -5,59 +5,64 @@ import "./SetUp.sol";
 
 contract G3MAllocateTest is G3MSetUp {
     function test_G3M_allocate_GivenX() public init {
-        uint256 amountX = 0.1 ether;
+        uint256 maxDeltaX = 0.1 ether;
 
+        (uint256 maxDeltaY, uint256 deltaLiquidity) =
+            solver.allocateGivenDeltaX(POOL_ID, maxDeltaX);
         (uint256 reserveX, uint256 reserveY, uint256 liquidity) =
             dfmm.getReservesAndLiquidity(POOL_ID);
 
-        console.log("reserveX:", reserveX);
-        console.log("reserveY:", reserveY);
-        console.log("liquidity:", liquidity);
-
-        GeometricMeanParams memory params = solver.getPoolParams(POOL_ID);
-
-        uint256 S = computePrice(reserveX, reserveY, params);
-        console.log("S:", S);
-
-        uint256 deltaLiquidity = computeLGivenX(amountX, S, params);
-        console.log("deltaLiquidity:", deltaLiquidity);
+        uint256 preLiquidityBalance = dfmm.liquidityOf(address(this), POOL_ID);
 
-        uint256 deltaY = computeY(amountX, S, params);
-        console.log("deltaY:", deltaY);
+        bytes memory data = abi.encode(maxDeltaX, maxDeltaY, deltaLiquidity);
+        (uint256 deltaX, uint256 deltaY) = dfmm.allocate(POOL_ID, data);
 
-        // uint256 preLiquidityBalance = dfmm.liquidityOf(address(this), POOL_ID);
-        // (,, uint256 preTotalLiquidity) = dfmm.getReservesAndLiquidity(POOL_ID);
+        (
+            uint256 adjustedReserveX,
+            uint256 adjustedReserveY,
+            uint256 adjustedLiquidity
+        ) = dfmm.getReservesAndLiquidity(POOL_ID);
 
-        bytes memory data = abi.encode(amountX * 2, deltaY * 2, deltaLiquidity);
-        dfmm.allocate(POOL_ID, data);
+        assertEq(adjustedReserveX, reserveX + deltaX);
+        assertEq(adjustedReserveY, reserveY + deltaY);
+        assertEq(adjustedLiquidity, liquidity + deltaLiquidity);
 
         /*
-        (,, uint256 postTotalLiquidity) = dfmm.getReservesAndLiquidity(POOL_ID);
-        uint256 deltaTotalLiquidity = postTotalLiquidity - preTotalLiquidity;
         assertEq(
-            preLiquidityBalance + deltaTotalLiquidity,
+            preLiquidityBalance + deltaLiquidity,
             dfmm.liquidityOf(address(this), POOL_ID)
         );
         */
     }
 
     function test_G3M_allocate_GivenY() public init {
-        uint256 amountX = 0.1 ether;
+        uint256 maxDeltaY = 0.1 ether;
 
-        (uint256 reserveX, uint256 reserveY, uint256 deltaLiquidity) =
-            solver.allocateGivenY(POOL_ID, amountX);
+        (uint256 maxDeltaX, uint256 deltaLiquidity) =
+            solver.allocateGivenDeltaY(POOL_ID, maxDeltaY);
+        (uint256 reserveX, uint256 reserveY, uint256 liquidity) =
+            dfmm.getReservesAndLiquidity(POOL_ID);
 
         uint256 preLiquidityBalance = dfmm.liquidityOf(address(this), POOL_ID);
-        (,, uint256 preTotalLiquidity) = dfmm.getReservesAndLiquidity(POOL_ID);
 
-        bytes memory data = abi.encode(reserveX, reserveY, deltaLiquidity);
-        dfmm.allocate(POOL_ID, data);
+        bytes memory data = abi.encode(maxDeltaX, maxDeltaY, deltaLiquidity);
+        (uint256 deltaX, uint256 deltaY) = dfmm.allocate(POOL_ID, data);
+
+        (
+            uint256 adjustedReserveX,
+            uint256 adjustedReserveY,
+            uint256 adjustedLiquidity
+        ) = dfmm.getReservesAndLiquidity(POOL_ID);
+
+        assertEq(adjustedReserveX, reserveX + deltaX);
+        assertEq(adjustedReserveY, reserveY + deltaY);
+        assertEq(adjustedLiquidity, liquidity + deltaLiquidity);
 
-        (,, uint256 postTotalLiquidity) = dfmm.getReservesAndLiquidity(POOL_ID);
-        uint256 deltaTotalLiquidity = postTotalLiquidity - preTotalLiquidity;
+        /*
         assertEq(
-            preLiquidityBalance + deltaTotalLiquidity,
+            preLiquidityBalance + deltaLiquidity,
             dfmm.liquidityOf(address(this), POOL_ID)
         );
+        */
     }
 }