Merge pull request #15 from ZealynxSecurity/refactor/LM_ManualExternalPriceSetter_v1.t.sol

Refactor: LM_ManualExternalPriceSetter_v1 test file

Author: Zitzak

src/modules/logicModule/LM_ManualExternalPriceSetter_v1.sol

@@ -136,20 +136,17 @@ contract LM_ManualExternalPriceSetter_v1 is
         _setRedemptionPrice(redemptionPrice_);
     }
 
-    /// @notice Gets current price for token issuance (buying tokens).
-    /// @return price_ Current price in 18 decimals (collateral tokens per 1
-    ///         issuance token).
-    /// @dev    Example: If price is 2 USDC/ISS, returns 2e18 (2 USDC needed for
-    ///         1 ISS).
+    /// @inheritdoc ILM_ManualExternalPriceSetter_v1
+    function getCollateralTokenDecimals() external view returns (uint8) {
+        return _collateralTokenDecimals;
+    }
+
+    /// @inheritdoc ILM_ManualExternalPriceSetter_v1
     function getPriceForIssuance() external view returns (uint) {
         return _issuancePrice;
     }
 
-    /// @notice Gets current price for token redemption (selling tokens).
-    /// @return price_ Current price in 18 decimals (collateral tokens per 1
-    ///         issuance token).
-    /// @dev    Example: If price is 1.9 USDC/ISS, returns 1.9e18 (1.9 USDC
-    ///         received for 1 ISS).
+    /// @inheritdoc ILM_ManualExternalPriceSetter_v1
     function getPriceForRedemption() external view returns (uint) {
         return _redemptionPrice;
     }

src/modules/logicModule/interfaces/ILM_ManualExternalPriceSetter_v1.sol

@@ -34,33 +34,59 @@ interface ILM_ManualExternalPriceSetter_v1 is IOraclePrice_v1 {
     error Module__LM_ExternalPriceSetter__InvalidPrice();
 
     // -------------------------------------------------------------------------
-
     // External Functions
 
+    /// @notice Gets current price for token issuance (buying tokens).
+    /// @return price_ Current price denominated in the collateral token decimals.
+    /// @dev    The price is denominated in the collateral token decimals. For
+    ///         example, if the collateral token has 6 decimals and the issuance
+    ///         price is 1.5, returns 1500000.
+    function getPriceForIssuance() external view returns (uint);
+
+    /// @notice Gets current price for token redemption (selling tokens).
+    /// @return price_ Current price denominated in the collateral token decimals.
+    /// @dev    The price is denominated in the collateral token decimals. For
+    ///         example, if the collateral token has 6 decimals and the redemption
+    ///         price is 0.5, the price_ parameter should be 500000.
+    function getPriceForRedemption() external view returns (uint);
+
     /// @notice	Sets the issuance price.
     /// @dev    The price_ parameter should be provided with the same number
     ///         of decimals as the collateral token. For example, if the
-    ///         collateral token has 6 decimals and the price is 1.5, input
-    ///         should be 1500000.
-    /// @param	price_ The price to set.
+    ///         collateral token has 6 decimals and the issuance price is 1.5,
+    ///         the price_ parameter should be 1500000.
+    /// @param	price_ The issuance price to set, denominated in the collateral
+    ///         token decimals.
     function setIssuancePrice(uint price_) external;
 
     /// @notice	Sets the redemption price.
     /// @dev    The price_ parameter should be provided with the same number of
-    ///         decimals as the issuance token. For example, if the issuance
-    ///         token has 18 decimals and the price is 1.5, input should be
-    ///         1500000000000000000.
-    /// @param	price_ The price to set.
+    ///         of decimals as the collateral token. For example, if the
+    ///         collateral token has 6 decimals and the redemption price is 0.5,
+    ///         the price_ parameter should be 500000.
+    /// @param	price_ The redemption price to set, denominated in the collateral
+    ///         token decimals.
     function setRedemptionPrice(uint price_) external;
 
-    /// @notice	Sets both issuance and redemption prices atomically.
-    /// @dev    Both prices must be non-zero. The issuancePrice_ should be in
-    ///         collateral token decimals and redemptionPrice_ in issuance token
-    ///         decimals.
-    /// @param	issuancePrice_ The issuance price to set.
-    /// @param	redemptionPrice_ The redemption price to set.
+    /// @notice	Sets both issuance and redemption prices atomically, denominated
+    ///         in the collateral token decimals.
+    /// @dev    Both prices must be non-zero. Both the issuance and redemption
+    ///         prices should be denominated in the collateral token decimals.
+    ///         For example, if the collateral token has 6 decimals and the
+    ///         issuance and redemption price are both 1.5, the issuancePrice_
+    ///         and redemptionPrice_ parameters should be 1500000.
+    /// @param	issuancePrice_ The issuance price to set, denominated in the
+    ///         collateral token decimals.
+    /// @param	redemptionPrice_ The redemption price to set, denominated in
+    ///         the collateral token decimals.
     function setIssuanceAndRedemptionPrice(
         uint issuancePrice_,
         uint redemptionPrice_
     ) external;
+
+    /// @notice	Gets the decimals of the collateral token.
+    /// @dev    Decimals in which the issuance and redemption prices
+    ///         are denominated.
+    /// @return	decimals_ The decimals of the collateral token.
+    function getCollateralTokenDecimals() external view returns (uint8);
 }

test/external/ERC20Issuance_blacklist_v1.t.sol

@@ -33,7 +33,7 @@ contract ERC20Issuance_Blacklist_v1_Test is Test {
     // State
     ERC20Issuance_Blacklist_v1_Exposed token;
 
-    // ═══════════════════════════════════════════════════════════════════════════════════════════════════════
+    // ================================================================================
     // Setup
     function setUp() public {
         // Setup token

test/modules/fundingManager/oracle/FM_PC_ExternalPrice_Redeeming_v1.t.sol

@@ -1032,6 +1032,7 @@ contract FM_PC_ExternalPrice_Redeeming_v1_Test is ModuleTest {
         vm.assume(buyer != address(0));
         vm.assume(buyer != address(this));
         vm.assume(buyer != admin);
+        vm.assume(buyer != address(fundingManager));
 
         // Given - Grant whitelist role to the user
         // _authorizer.grantRole(roleId, buyer);