Move web3 wrapper from devDependencies to dependencies. Add Compliance and SecurityTokenRegistrar to the Polymath class. Remove SecurityTokenRegistrar's dependency on a SecurityToken.

Author: Adam0000

package.json

@@ -59,12 +59,12 @@
     "mnemonic": "age drama cover door helmet mechanic wine lesson vote inflict will keep"
   },
   "dependencies": {
+    "@0xproject/web3-wrapper": "0.1.2",
     "truffle-contract": "3.0.1",
     "uuid": "3.1.0",
     "web3": "0.20.1"
   },
   "devDependencies": {
-    "@0xproject/web3-wrapper": "0.1.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.0",
     "babel-eslint": "8.1.2",

src/contract_wrappers/Compliance.js

@@ -5,8 +5,6 @@ import Web3 from 'web3';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 import ContractWrapper from './ContractWrapper';
-import Customers from './Customers';
-import SecurityTokenRegistrar from './SecurityTokenRegistrar';
 
 import complianceArtifact from '../artifacts/Compliance.json';
 import type {
@@ -28,13 +26,9 @@ export default class Compliance extends ContractWrapper {
    */
   constructor(
     web3Wrapper: Web3Wrapper,
-    customers: Customers,
     deployedAddress?: string,
   ) {
     super(web3Wrapper, complianceArtifact, deployedAddress);
-
-    this.customers = customers;
-    this.securityTokenRegistrar = SecurityTokenRegistrar;
   }
 
   /**

src/contract_wrappers/Customers.js

@@ -30,7 +30,7 @@ type LogCustomerVerifiedArgsUnprocessed = {
  * Wrapper for the Customers Solidity contract
  */
 export default class Customers extends ContractWrapper {
-  // polyToken: PolyToken;
+  polyToken: PolyToken;
 
   /**
    * @hideconstructor

src/contract_wrappers/SecurityTokenRegistrar.js

@@ -4,8 +4,6 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { BigNumber } from 'bignumber.js';
 import ContractWrapper from './ContractWrapper';
 import securityTokenRegistrarArtifact from '../artifacts/SecurityTokenRegistrar.json';
-import SecurityToken from './SecurityToken';
-import Compliance from './Compliance';
 import type {
   BlockRange,
   SecurityTokenRegistrarEventArgs,
@@ -24,14 +22,9 @@ export default class SecurityTokenRegistrar extends ContractWrapper {
    */
   constructor(
     web3Wrapper: Web3Wrapper,
-    securityToken: SecurityToken,
-    compliance: Compliance,
     deployedAddress?: string,
   ) {
     super(web3Wrapper, securityTokenRegistrarArtifact, deployedAddress);
-
-    this.securityToken = securityToken;
-    this.compliance = compliance;
   }
 
   /**

src/index.js

@@ -3,7 +3,7 @@
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 // import { ContractNotFoundError } from './types';
-import { Customers, PolyToken } from './contract_wrappers';
+import { Compliance, Customers, PolyToken, SecurityTokenRegistrar } from './contract_wrappers';
 import type { Web3Provider } from './types';
 
 export * from './contract_wrappers';
@@ -21,6 +21,8 @@ export class Polymath {
 
   polyToken: PolyToken;
   customers: Customers;
+  compliance: Compliance;
+  securityTokenRegistrar: SecurityTokenRegistrar;
 
   constructor(web3Provider: Web3Provider) {
     this._web3Wrapper = new Web3Wrapper(web3Provider);
@@ -33,6 +35,12 @@ export class Polymath {
     this.customers = new Customers(this._web3Wrapper, this.polyToken);
     initializePromises.push(this.customers.initialize());
 
+    this.compliance = new Compliance(this._web3Wrapper);
+    initializePromises.push(this.compliance.initialize());
+
+    this.securityTokenRegistrar = new SecurityTokenRegistrar(this._web3Wrapper);
+    initializePromises.push(this.securityTokenRegistrar.initialize());
+
     this.initializedPromise = Promise.all(initializePromises);
   }
 }

test/Compliance_test.js

@@ -54,7 +54,6 @@ describe('Compliance wrapper', () => {
       polyToken,
       customers,
       compliance,
-      securityToken,
       accounts[0],
       accounts[1],
       expiryTime,

test/SecurityToken_test.js

@@ -53,7 +53,6 @@ describe('SecurityToken wrapper', () => {
       polyToken,
       customers,
       compliance,
-      securityToken,
       accounts[0],
       accounts[1],
       expiryTime,

test/util/make_examples.js

@@ -235,7 +235,6 @@ export async function makeSecurityTokenRegistrar(
   polyToken: PolyToken,
   customers: Customers,
   compliance: Compliance,
-  securityToken: SecurityToken,
   account: string,
 ) {
   const contractTemplate = contract(securityTokenRegistrarArtifact);
@@ -250,7 +249,7 @@ export async function makeSecurityTokenRegistrar(
       from: account,
     },
   );
-  const registrar = new SecurityTokenRegistrar(web3Wrapper, securityToken, compliance, instance.address);
+  const registrar = new SecurityTokenRegistrar(web3Wrapper, instance.address);
 
   await registrar.initialize();
   return registrar;
@@ -312,7 +311,6 @@ export async function makeSecurityTokenThroughRegistrar(
   polyToken: PolyToken,
   customers: Customers,
   compliance: Compliance,
-  securityToken: SecurityToken,
   account: string,
   hostAccount: string,
   currentBlockTime: number,
@@ -329,7 +327,7 @@ export async function makeSecurityTokenThroughRegistrar(
       from: account,
     },
   );
-  const registrar = new SecurityTokenRegistrar(web3Wrapper, securityToken, compliance, instance.address);
+  const registrar = new SecurityTokenRegistrar(web3Wrapper, instance.address);
 
   await registrar.initialize();