refactor bnb liquidity

Author: YouStillAlive

contracts/BNBPartyLiquidity.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "./BNBPartyCreation.sol";
+import "./BNBPartyLiquidityHelper.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
 
 /// @title BNBPartyLiquidity
-/// @notice This abstract contract manages handling of liquidity pools within the BNB Party system.
-abstract contract BNBPartyLiquidity is BNBPartyCreation {
+/// @notice This abstract contract manages the creation and handling of liquidity pools within the BNB Party system.
+abstract contract BNBPartyLiquidity is BNBPartyLiquidityHelper {
     /// @notice Handles liquidity by decreasing the liquidity, collecting tokens, and creating a new liquidity pool.
     /// @param recipient Address receiving the bonus BNB
     /// @dev Decreases liquidity, collects tokens, creates a new pool, and sends bonuses
@@ -18,24 +18,7 @@ abstract contract BNBPartyLiquidity is BNBPartyCreation {
         uint128 liquidity = pool.liquidity();
 
         // Decrease liquidity and collect tokens
-        (uint256 amount0, uint256 amount1) = BNBPositionManager.decreaseLiquidity(
-            INonfungiblePositionManager.DecreaseLiquidityParams({
-                tokenId: lpToTokenId[msg.sender],
-                liquidity: liquidity,
-                amount0Min: 0,
-                amount1Min: 0,
-                deadline: block.timestamp
-            })
-        );
-
-        BNBPositionManager.collect(
-            INonfungiblePositionManager.CollectParams({
-                tokenId: lpToTokenId[msg.sender],
-                recipient: address(this),
-                amount0Max: uint128(amount0),
-                amount1Max: uint128(amount1)
-            })
-        );
+        (uint256 amount0, uint256 amount1) = _decreaseAndCollect(lpToTokenId[msg.sender], liquidity);
 
         uint256 unwrapAmount = party.bonusTargetReach + party.bonusPartyCreator + party.targetReachFee;
         uint160 newSqrtPriceX96;
@@ -59,24 +42,14 @@ abstract contract BNBPartyLiquidity is BNBPartyCreation {
             );
         }
 
-        IERC20(token0).approve(address(positionManager), amount0);
-        IERC20(token1).approve(address(positionManager), amount1);
+        // Approve tokens for the new liquidity pool creation
+        _approveTokens(token0, token1, amount0, amount1);
         // Create new Liquidity Pool
         _createLP(positionManager, token0, token1, amount0, amount1, newSqrtPriceX96, party.lpFee, party.lpTicks);
 
         // Send bonuses
         _unwrapAndSendBNB(recipient, unwrapAmount);
         // burn meme tokens
-        if(token0 == address(WBNB)) {
-            _burnMemeToken(token1);
-        }
-        else {
-            _burnMemeToken(token0);
-        }
-    }
-
-    function _burnMemeToken(address token) internal {
-        uint256 balance = IERC20(token).balanceOf(address(this));
-        ERC20Burnable(token).burn(balance);
+        _burnMemeToken(token0 == address(WBNB) ? token1 : token0);
     }
 }

contracts/BNBPartyLiquidityHelper.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import "./BNBPartyCreation.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
+
+/// @title BNBPartyLiquidityHelper
+/// @notice This abstract contract manages the liquidity helper functions within the BNB Party system.
+abstract contract BNBPartyLiquidityHelper is BNBPartyCreation {
+    function _decreaseAndCollect(
+        uint256 tokenId,
+        uint128 liquidity
+    ) internal returns (uint256 amount0, uint256 amount1) {
+        (amount0, amount1) = BNBPositionManager.decreaseLiquidity(
+            INonfungiblePositionManager.DecreaseLiquidityParams({
+                tokenId: tokenId,
+                liquidity: liquidity,
+                amount0Min: 0,
+                amount1Min: 0,
+                deadline: block.timestamp
+            })
+        );
+
+        BNBPositionManager.collect(
+            INonfungiblePositionManager.CollectParams({
+                tokenId: tokenId,
+                recipient: address(this),
+                amount0Max: uint128(amount0),
+                amount1Max: uint128(amount1)
+            })
+        );
+    }
+
+    function _approveTokens(
+        address token0,
+        address token1,
+        uint256 amount0,
+        uint256 amount1
+    ) internal {
+        IERC20(token0).approve(address(positionManager), amount0);
+        IERC20(token1).approve(address(positionManager), amount1);
+    }
+
+    function _burnMemeToken(address token) internal {
+        uint256 balance = IERC20(token).balanceOf(address(this));
+        ERC20Burnable(token).burn(balance);
+    }
+}