fix: address review comments across controller and freezeIssuance

Author: Victor Wiebe

src/entities/SecurityToken/Controller.ts

@@ -20,8 +20,8 @@ export class Controller extends SubModule {
   };
 
   /**
-   * Used by the issuer to permanently disable controller functionality
-   * Signature is optional, and will be generated if it is not passed in
+   * Permanently disable controller functionality
+   * @param signature optional signed data. If not passed, signing will be requested on the spot
    */
   public disableController = async (args?: { signature?: string }) => {
     const { symbol } = this.securityToken;

src/entities/SecurityToken/Shareholders.ts

@@ -225,8 +225,8 @@ export class Shareholders extends SubModule {
   };
 
   /**
-   * Used by the issuer to permanently freeze issuance of the security token
-   * Signature is optional, and will be generated if it is not passed in
+   * Permanently freeze issuance of the security token
+   * @param signature optional signed data. If not passed, signing will be requested on the spot
    */
   public freezeIssuance = async (args?: { signature?: string }) => {
     const { symbol } = this.securityToken;

src/procedures/DisableController.ts

@@ -27,7 +27,11 @@ export class DisableController extends Procedure<DisableControllerProcedureArgs>
       });
     }
 
-    const [owner, account] = await Promise.all([securityToken.owner(), currentWallet.address()]);
+    const [owner, account, isControllable] = await Promise.all([
+      securityToken.owner(),
+      currentWallet.address(),
+      securityToken.isControllable(),
+    ]);
 
     if (account !== owner) {
       throw new PolymathError({
@@ -36,15 +40,16 @@ export class DisableController extends Procedure<DisableControllerProcedureArgs>
       });
     }
 
-    if (!(await securityToken.isControllable())) {
+    if (!isControllable) {
       throw new PolymathError({
         code: ErrorCode.ProcedureValidationError,
-        message: `The security token isControllable method is not currently valid, disable controller method can only be called on controllable security tokens`,
+        message: `The controller has already been disabled permanently`,
       });
     }
 
     // If there is no hex signature passed in, create a signature request to sign the disable controller acknowledgement
-    const requestedSignature = signature || await this.addSignatureRequest(securityToken.signDisableControllerAck)({});
+    const requestedSignature =
+      signature || (await this.addSignatureRequest(securityToken.signDisableControllerAck)({}));
 
     /**
      * Transactions

src/procedures/FreezeIssuance.ts

@@ -27,24 +27,28 @@ export class FreezeIssuance extends Procedure<FreezeIssuanceProcedureArgs> {
       });
     }
 
-    const owner = await securityToken.owner();
-    const account = await currentWallet.address();
+    const [owner, account, isIssuable] = await Promise.all([
+      securityToken.owner(),
+      currentWallet.address(),
+      securityToken.isIssuable(),
+    ]);
 
     if (account !== owner) {
       throw new PolymathError({
         code: ErrorCode.ProcedureValidationError,
-        message: `You must be the owner of this Security Token to disable the controller`,
+        message: `You must be the owner of this Security Token to freeze issuance`,
       });
     }
 
-    if (!(await securityToken.isIssuable())) {
+    if (!isIssuable) {
       throw new PolymathError({
         code: ErrorCode.ProcedureValidationError,
-        message: `The security token isIssuable method is not currently valid, freeze issuance method can only be called on issuable security tokens`,
+        message: `The issuance has already been frozen permanently`,
       });
     }
     // If there is no hex signature passed in, create a signature request to sign the freeze issuance acknowledgement
-    const requestedSignature = signature || await this.addSignatureRequest(securityToken.signFreezeIssuanceAck)({});
+    const requestedSignature =
+      signature || (await this.addSignatureRequest(securityToken.signFreezeIssuanceAck)({}));
 
     /**
      * Transactions

src/procedures/__tests__/FreezeIssuance.ts

@@ -20,7 +20,7 @@ const params: FreezeIssuanceProcedureArgs = {
 };
 
 const ownerAddress = '0x01';
-const randomSignature = 'Random disable controller signature ack';
+const randomSignature = 'Random freeze issuance signature ack';
 
 describe('FreezeIssuance', () => {
   let target: FreezeIssuance;
@@ -97,7 +97,7 @@ describe('FreezeIssuance', () => {
       await expect(target.prepareTransactions()).rejects.toThrowError(
         new PolymathError({
           code: ErrorCode.ProcedureValidationError,
-          message: `You must be the owner of this Security Token to disable the controller`,
+          message: `You must be the owner of this Security Token to freeze issuance`,
         })
       );
     });

src/procedures/__tests__/LaunchTieredSto.ts

@@ -45,7 +45,7 @@ const params: LaunchTieredStoProcedureArgs = {
   currencies: [Currency.StableCoin],
   stableCoinAddresses: ['0x7777777777777777777777777777777777777777'],
   customOracleAddresses: ['0x8888888888888888888888888888888888888888'],
-  denominatedCurrency: 'USDT',
+  denominatedCurrency: 'USD',
 };
 
 const currentWallet = '0x8888888888888888888888888888888888888888';