refactor: rename issuance to subscription

Author: yan-man

src/contracts/facilitators/gsm/converter/GsmConverter.sol

@@ -11,7 +11,7 @@ import {IGsm} from '../interfaces/IGsm.sol';
 import {IGsmConverter} from './interfaces/IGsmConverter.sol';
 import {IRedemption} from '../dependencies/circle/IRedemption.sol';
 // TODO: replace with proper issuance implementation later
-import {MockBUIDLIssuanceReceiver} from '../../../../test/mocks/MockBUIDLIssuanceReceiver.sol';
+import {MockBUIDLSubscription} from '../../../../test/mocks/MockBUIDLSubscription.sol';
 
 import 'forge-std/console2.sol';
 
@@ -51,7 +51,7 @@ contract GsmConverter is Ownable, EIP712, IGsmConverter {
   address public immutable REDEMPTION_CONTRACT;
 
   /// @inheritdoc IGsmConverter
-  address public immutable ISSUANCE_RECEIVER_CONTRACT;
+  address public immutable SUBSCRIPTION_CONTRACT;
 
   /// @inheritdoc IGsmConverter
   mapping(address => uint256) public nonces;
@@ -81,7 +81,7 @@ contract GsmConverter is Ownable, EIP712, IGsmConverter {
 
     GSM = gsm;
     REDEMPTION_CONTRACT = redemptionContract;
-    ISSUANCE_RECEIVER_CONTRACT = issuanceReceiverContract;
+    SUBSCRIPTION_CONTRACT = issuanceReceiverContract;
     ISSUED_ASSET = issuedAsset; // BUIDL
     REDEEMED_ASSET = redeemedAsset; // USDC
     GHO_TOKEN = IGsm(GSM).GHO_TOKEN();
@@ -232,16 +232,16 @@ contract GsmConverter is Ownable, EIP712, IGsmConverter {
 
     (uint256 redeemedAssetAmount, , , ) = IGsm(GSM).getGhoAmountForSellAsset(maxAmount);
     IERC20(REDEEMED_ASSET).transferFrom(originator, address(this), redeemedAssetAmount);
-    IERC20(REDEEMED_ASSET).approve(ISSUANCE_RECEIVER_CONTRACT, redeemedAssetAmount);
+    IERC20(REDEEMED_ASSET).approve(SUBSCRIPTION_CONTRACT, redeemedAssetAmount);
     //TODO: replace with proper issuance implementation later
-    MockBUIDLIssuanceReceiver(ISSUANCE_RECEIVER_CONTRACT).issuance(redeemedAssetAmount);
+    MockBUIDLSubscription(SUBSCRIPTION_CONTRACT).issuance(redeemedAssetAmount);
     require(
       IERC20(ISSUED_ASSET).balanceOf(address(this)) ==
         initialissuedAssetBalance + redeemedAssetAmount,
       'INVALID_ISSUANCE'
     );
     // reset approval after issuance
-    IERC20(REDEEMED_ASSET).approve(ISSUANCE_RECEIVER_CONTRACT, 0);
+    IERC20(REDEEMED_ASSET).approve(SUBSCRIPTION_CONTRACT, 0);
 
     IERC20(ISSUED_ASSET).approve(GSM, redeemedAssetAmount);
     (uint256 assetAmount, uint256 ghoBought) = IGsm(GSM).sellAsset(maxAmount, receiver);

src/contracts/facilitators/gsm/converter/interfaces/IGsmConverter.sol

@@ -143,10 +143,10 @@ interface IGsmConverter {
   function REDEMPTION_CONTRACT() external view returns (address);
 
   /**
-   * @notice Returns the address of the issuance receiver contract that manages asset issuance
-   * @return The address of the issuance receiver contract
+   * @notice Returns the address of the subscription contract that manages asset issuance
+   * @return The address of the subscription contract
    */
-  function ISSUANCE_RECEIVER_CONTRACT() external view returns (address);
+  function SUBSCRIPTION_CONTRACT() external view returns (address);
 
   /**
    * @notice Returns the current nonce (for EIP-712 signature methods) of an address

src/test/TestGhoBase.t.sol

@@ -34,9 +34,9 @@ import {WETH9Mock} from '@aave/periphery-v3/contracts/mocks/WETH9Mock.sol';
 import {MockRedemption} from './mocks/MockRedemption.sol';
 import {MockRedemptionFailedIssuedAssetAmount} from './mocks/MockRedemptionFailedIssuedAssetAmount.sol';
 import {MockRedemptionFailed} from './mocks/MockRedemptionFailed.sol';
-import {MockBUIDLIssuanceReceiver} from './mocks/MockBUIDLIssuanceReceiver.sol';
-import {MockBUIDLIssuanceReceiverFailed} from './mocks/MockBUIDLIssuanceReceiverFailed.sol';
-import {MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted} from './mocks/MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted.sol';
+import {MockBUIDLSubscription} from './mocks/MockBUIDLSubscription.sol';
+import {MockBUIDLSubscriptionFailed} from './mocks/MockBUIDLSubscriptionFailed.sol';
+import {MockBUIDLSubscriptionFailedInvalidUSDCAccepted} from './mocks/MockBUIDLSubscriptionFailedInvalidUSDCAccepted.sol';
 import {MockPoolDataProvider} from './mocks/MockPoolDataProvider.sol';
 
 // interfaces
@@ -128,9 +128,9 @@ contract TestGhoBase is Test, Constants, Events {
   MockRedemption BUIDL_USDC_REDEMPTION;
   MockRedemptionFailedIssuedAssetAmount BUIDL_USDC_REDEMPTION_FAILED_ISSUED_ASSET_AMOUNT;
   MockRedemptionFailed BUIDL_USDC_REDEMPTION_FAILED;
-  MockBUIDLIssuanceReceiver BUIDL_USDC_ISSUANCE;
-  MockBUIDLIssuanceReceiverFailed BUIDL_USDC_ISSUANCE_FAILED;
-  MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted BUIDL_USDC_ISSUANCE_FAILED_INVALID_USDC;
+  MockBUIDLSubscription BUIDL_USDC_ISSUANCE;
+  MockBUIDLSubscriptionFailed BUIDL_USDC_ISSUANCE_FAILED;
+  MockBUIDLSubscriptionFailedInvalidUSDCAccepted BUIDL_USDC_ISSUANCE_FAILED_INVALID_USDC;
   PriceOracle PRICE_ORACLE;
   WETH9Mock WETH;
   GhoVariableDebtToken GHO_DEBT_TOKEN;
@@ -408,12 +408,12 @@ contract TestGhoBase is Test, Constants, Events {
       address(BUIDL_TOKEN),
       address(USDC_TOKEN)
     );
-    BUIDL_USDC_ISSUANCE = new MockBUIDLIssuanceReceiver(address(BUIDL_TOKEN), address(USDC_TOKEN));
-    BUIDL_USDC_ISSUANCE_FAILED = new MockBUIDLIssuanceReceiverFailed(
+    BUIDL_USDC_ISSUANCE = new MockBUIDLSubscription(address(BUIDL_TOKEN), address(USDC_TOKEN));
+    BUIDL_USDC_ISSUANCE_FAILED = new MockBUIDLSubscriptionFailed(
       address(BUIDL_TOKEN),
       address(USDC_TOKEN)
     );
-    BUIDL_USDC_ISSUANCE_FAILED_INVALID_USDC = new MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted(
+    BUIDL_USDC_ISSUANCE_FAILED_INVALID_USDC = new MockBUIDLSubscriptionFailedInvalidUSDCAccepted(
       address(BUIDL_TOKEN),
       address(USDC_TOKEN)
     );

src/test/TestGsmConverter.t.sol

@@ -29,7 +29,7 @@ contract TestGsmConverter is TestGhoBase {
       'Unexpected redemption contract address'
     );
     assertEq(
-      gsmConverter.ISSUANCE_RECEIVER_CONTRACT(),
+      gsmConverter.SUBSCRIPTION_CONTRACT(),
       address(BUIDL_USDC_ISSUANCE),
       'Unexpected issuance receiver contract address'
     );

src/test/mocks/MockBUIDLIssuanceReceiver.sol renamed to src/test/mocks/MockBUIDLSubscription.sol

@@ -4,9 +4,9 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import {SafeERC20} from '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 
 /**
- * @title MockBUIDLIssuanceReceiver
+ * @title MockBUIDLSubscription
  */
-contract MockBUIDLIssuanceReceiver {
+contract MockBUIDLSubscription {
   using SafeERC20 for IERC20;
 
   address public immutable asset;

src/test/mocks/MockBUIDLIssuanceReceiverFailed.sol renamed to src/test/mocks/MockBUIDLSubscriptionFailed.sol

@@ -4,9 +4,9 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import {SafeERC20} from '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 
 /**
- * @title MockBUIDLIssuanceReceiverFailed
+ * @title MockBUIDLSubscriptionFailed
  */
-contract MockBUIDLIssuanceReceiverFailed {
+contract MockBUIDLSubscriptionFailed {
   using SafeERC20 for IERC20;
 
   address public immutable asset;

src/test/mocks/MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted.sol renamed to src/test/mocks/MockBUIDLSubscriptionFailedInvalidUSDCAccepted.sol

@@ -4,10 +4,10 @@ import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import {SafeERC20} from '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 
 /**
- * @title MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted
+ * @title MockBUIDLSubscriptionFailedInvalidUSDCAccepted
  * @dev During issuance, the contract does not accept the proper amount of USDC but issues asset properly
  */
-contract MockBUIDLIssuanceReceiverFailedInvalidUSDCAccepted {
+contract MockBUIDLSubscriptionFailedInvalidUSDCAccepted {
   using SafeERC20 for IERC20;
 
   address public immutable asset;