fix: check that corresponding feature is enabled

PolymathNetwork · Nov 18, 2019 · 358b23f · 358b23f
1 parent d81d24b
commit 358b23f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/entities/SecurityToken/Permissions.ts b/src/entities/SecurityToken/Permissions.ts
@@ -197,14 +197,25 @@ export class Permissions extends SubModule {
       securityToken: { symbol, features },
     } = this;
 
-    const isPermissionsEnabled = await features.isEnabled({ feature: Feature.Permissions });
+    const [isPermissionsEnabled, requiredFeature] = await Promise.all([
+      features.isEnabled({ feature: Feature.Permissions }),
+      this.getFeatureFromRole({ role }),
+    ]);
     if (!isPermissionsEnabled) {
       throw new PolymathError({
         code: ErrorCode.FeatureNotEnabled,
         message: 'You must enable the Permissions feature',
       });
     }
 
+    const isFeatureEnabled = await features.isEnabled({ feature: requiredFeature });
+    if (!isFeatureEnabled) {
+      throw new PolymathError({
+        code: ErrorCode.FeatureNotEnabled,
+        message: `You must enable the ${requiredFeature} feature to check delegates for role ${role}`,
+      });
+    }
+
     const generalPermissionManager = (await contractWrappers.getAttachedModules(
       { moduleName: ModuleName.GeneralPermissionManager, symbol },
       { unarchived: true }

diff --git a/src/procedures/AssignSecurityTokenRole.ts b/src/procedures/AssignSecurityTokenRole.ts
@@ -34,7 +34,7 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
     if (!permissionModule) {
       throw new PolymathError({
         code: ErrorCode.ProcedureValidationError,
-        message: 'You must enable the Permissions feature',
+        message: 'You must enable the Permissions feature in order to assign roles',
       });
     }
 
@@ -51,7 +51,7 @@ export class AssignSecurityTokenRole extends Procedure<AssignSecurityTokenRolePr
     if (!isAvailable) {
       throw new PolymathError({
         code: ErrorCode.FeatureNotEnabled,
-        message: `You must enable the ${requiredFeature} feature`,
+        message: `You must enable the ${requiredFeature} feature in order to assign the ${role} role`,
       });
     }