refactor: embed restrictions into transfer namespace

PolymathNetwork · Dec 11, 2019 · c4585d5 · c4585d5
1 parent 2226628
commit c4585d5
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/src/entities/SecurityToken/SecurityToken.ts b/src/entities/SecurityToken/SecurityToken.ts
@@ -9,7 +9,6 @@ import { Permissions } from './Permissions';
 import { Transfers } from './Transfers';
 import { PolymathError } from '../../PolymathError';
 import { ErrorCode } from '../../types';
-import { Restrictions } from './Restrictions';
 import { Documents } from './Documents';
 
 export interface UniqueIdentifiers {
@@ -72,8 +71,6 @@ export class SecurityToken extends Entity<Params> {
 
   public transfers: Transfers;
 
-  public restrictions: Restrictions;
-
   public documents: Documents;
 
   constructor(params: Params & UniqueIdentifiers, context: Context) {
@@ -92,7 +89,6 @@ export class SecurityToken extends Entity<Params> {
     this.offerings = new Offerings(this, context);
     this.permissions = new Permissions(this, context);
     this.transfers = new Transfers(this, context);
-    this.restrictions = new Restrictions(this, context);
     this.documents = new Documents(this, context);
   }
 

diff --git a/...tyToken/Restrictions/CountRestrictions.ts → ...ansfers/Restrictions/CountRestrictions.ts b/...tyToken/Restrictions/CountRestrictions.ts → ...ansfers/Restrictions/CountRestrictions.ts
@@ -1,8 +1,8 @@
 import { ModuleName } from '@polymathnetwork/contract-wrappers';
-import { ErrorCode } from '../../../types';
-import { ModifyMaxHolderCount } from '../../../procedures';
-import { SubModule } from '../SubModule';
-import { PolymathError } from '../../../PolymathError';
+import { ErrorCode } from '../../../../types';
+import { ModifyMaxHolderCount } from '../../../../procedures';
+import { SubModule } from '../../SubModule';
+import { PolymathError } from '../../../../PolymathError';
 
 export class CountRestrictions extends SubModule {
   /**

diff --git a/...en/Restrictions/PercentageRestrictions.ts → ...rs/Restrictions/PercentageRestrictions.ts b/...en/Restrictions/PercentageRestrictions.ts → ...rs/Restrictions/PercentageRestrictions.ts
@@ -8,11 +8,11 @@ import {
   ErrorCode,
   PercentageWhitelistEntry,
   ModifyPercentageExemptionsProcedureArgs,
-} from '../../../types';
-import { ModifyMaxHolderPercentage, ModifyPercentageExemptions } from '../../../procedures';
-import { SubModule } from '../SubModule';
-import { PolymathError } from '../../../PolymathError';
-import { TransactionQueue } from '../../TransactionQueue';
+} from '../../../../types';
+import { ModifyMaxHolderPercentage, ModifyPercentageExemptions } from '../../../../procedures';
+import { SubModule } from '../../SubModule';
+import { PolymathError } from '../../../../PolymathError';
+import { TransactionQueue } from '../../../TransactionQueue';
 
 interface PercentageWhitelistParams {
   whitelistEntries: PercentageWhitelistEntry[];

diff --git a/...ecurityToken/Restrictions/Restrictions.ts → ...en/Transfers/Restrictions/Restrictions.ts b/...ecurityToken/Restrictions/Restrictions.ts → ...en/Transfers/Restrictions/Restrictions.ts
@@ -1,8 +1,8 @@
-import { SubModule } from '../SubModule';
+import { SubModule } from '../../SubModule';
 import { CountRestrictions } from './CountRestrictions';
 import { PercentageRestrictions } from './PercentageRestrictions';
-import { SecurityToken } from '../SecurityToken';
-import { Context } from '../../../Context';
+import { SecurityToken } from '../../SecurityToken';
+import { Context } from '../../../../Context';
 
 export class Restrictions extends SubModule {
   public count: CountRestrictions;

diff --git a/...ities/SecurityToken/Restrictions/index.ts → ...rityToken/Transfers/Restrictions/index.ts b/...ities/SecurityToken/Restrictions/index.ts → ...rityToken/Transfers/Restrictions/index.ts
diff --git a/src/entities/SecurityToken/Transfers.ts → ...ties/SecurityToken/Transfers/Transfers.ts b/src/entities/SecurityToken/Transfers.ts → ...ties/SecurityToken/Transfers/Transfers.ts
@@ -1,8 +1,19 @@
 import { BigNumber } from '@polymathnetwork/contract-wrappers';
-import { SubModule } from './SubModule';
-import { ControllerTransfer, SetController } from '../../procedures';
+import { SubModule } from '../SubModule';
+import { ControllerTransfer, SetController } from '../../../procedures';
+import { Restrictions } from './Restrictions';
+import { SecurityToken } from '../SecurityToken';
+import { Context } from '../../../Context';
 
 export class Transfers extends SubModule {
+  public restrictions: Restrictions;
+
+  constructor(securityToken: SecurityToken, context: Context) {
+    super(securityToken, context);
+
+    this.restrictions = new Restrictions(securityToken, context);
+  }
+
   /**
    * Set the address of the Security Token's Controller. The controller may perform forced transfers
    */

diff --git a/src/entities/SecurityToken/Transfers/index.ts b/src/entities/SecurityToken/Transfers/index.ts
@@ -0,0 +1 @@
+export { Transfers } from './Transfers';