Merge pull request #43 from PolymathNetwork/st-test

St test

Author: priom

src/contract_wrappers/SecurityToken.js

@@ -315,13 +315,14 @@ export default class SecurityToken extends ContractWrapper {
   }
 
   /**
-   * Add a verified address to the Security Token whitelist
-   * @param investorAddress   Investor address to whitelist
+   * Voting to freeze the funds of the recipient address
+   * @param shareHolderAddress   shareholder of the security token
    * @param recipientAddress  User who is getting voted agaisnt to freeze their POLY
    */
-  async voteToFreeze(investorAddress: string, recipientAddress: string) {
+  async voteToFreeze(shareHolderAddress: string, recipientAddress: string) {
     await this._contract.voteToFreeze(recipientAddress, {
-      from: investorAddress,
+      from: shareHolderAddress,
+      gas : 300000,
     });
   }
 

test/Compliance_test.js

@@ -1,3 +1,5 @@
+// @flow
+
 import BigNumber from 'bignumber.js';
 import chai from 'chai';
 import 'mocha';
@@ -14,13 +16,15 @@ import {
   makeTemplateWithFinalized,
   makeSecurityTokenThroughRegistrar,
 } from './util/make_examples';
-import { makeWeb3Wrapper } from './util/web3';
+import { makeWeb3Wrapper, makeWeb3 } from './util/web3';
 import { fakeAddress } from './util/fake';
 
 const { assert } = chai;
 
 describe('Compliance wrapper', () => {
   const web3Wrapper = makeWeb3Wrapper();
+  const web3 = makeWeb3();
+  const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000);
 
   let accounts;
   let polyToken;
@@ -70,24 +74,26 @@ describe('Compliance wrapper', () => {
   });
 
   it('createTemplate', async () => {
-    await makeKYCProvider(customers, accounts[1]);
-    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
+    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2], expiryTime);
     const templateAddress = await makeTemplate(
       compliance,
       accounts[1],
       accounts[2],
+      expiryTime,
     );
 
     assert.isAbove(templateAddress.length, 0);
   });
 
   it('proposeTemplate, templateReputation, getTemplateAddressByProposal, cancelTemplateProposal', async () => {
-    await makeKYCProvider(customers, accounts[1]);
-    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
+    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2], expiryTime);
     const templateAddress = await makeTemplateWithFinalized(
       compliance,
       accounts[1],
       accounts[2],
+      expiryTime,
     );
 
     // Propose Template
@@ -109,7 +115,7 @@ describe('Compliance wrapper', () => {
   });
 
   it('setSTO', async () => {
-    await makeKYCProvider(customers, accounts[1]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
 
     await compliance.setSTO(
       accounts[0],
@@ -135,7 +141,7 @@ describe('Compliance wrapper', () => {
     let subscriptionID1 = null;
     const eventName1 = 'LogTemplateCreated';
     const indexedFilterValues1 = ["_creator"];
-
+    const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000);
     //the callback is passed into the filter.watch function, and is operated on when a new event comes in
     const logTemplateCreatedArgsPromise = new Promise((resolve, reject) => {
       subscriptionID1 = compliance.subscribe(eventName1, indexedFilterValues1, (err, log) => {
@@ -181,12 +187,13 @@ describe('Compliance wrapper', () => {
       });
     });
 
-    await makeKYCProvider(customers, accounts[1]);
-    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
+    await makeLegalDelegate(polyToken, customers, accounts[1], accounts[2], expiryTime);
     const templateAddress = await makeTemplate(
       compliance,
       accounts[1],
       accounts[2],
+      expiryTime,
     );
 
 

test/Customers_test.js

@@ -3,14 +3,15 @@ import chai from 'chai';
 import 'mocha';
 
 import { makeCustomers, makePolyToken, makeKYCProvider } from './util/make_examples';
-import { makeWeb3Wrapper } from './util/web3';
+import { makeWeb3Wrapper, makeWeb3 } from './util/web3';
 import { fakeAddress } from './util/fake';
 
 const { assert } = chai;
 
 describe('Customers wrapper', () => {
   const web3Wrapper = makeWeb3Wrapper();
-
+  const web3 = makeWeb3();
+  const expiryTime = new BigNumber(web3.eth.getBlock('latest').timestamp).plus(10000);
   let accounts;
   let polyToken;
   let customers;
@@ -40,7 +41,7 @@ describe('Customers wrapper', () => {
 
   describe('getKYCProviderByAddress', () => {
     it('should return created provider', async () => {
-      await makeKYCProvider(customers, accounts[1]);
+      await makeKYCProvider(customers, accounts[1], expiryTime);
 
       const provider = await customers.getKYCProviderByAddress(accounts[1]);
       assert.equal(provider.name, 'Provider');
@@ -51,7 +52,7 @@ describe('Customers wrapper', () => {
     });
 
     it('should emit LogNewProvider event', async () => {
-      await makeKYCProvider(customers, accounts[1]);
+      await makeKYCProvider(customers, accounts[1], expiryTime);
       const logs = await customers.getLogs(
         'LogNewProvider',
         {},
@@ -68,7 +69,7 @@ describe('Customers wrapper', () => {
     });
 
     it('should change verification fee', async () => {
-      await makeKYCProvider(customers, accounts[1]);
+      await makeKYCProvider(customers, accounts[1], expiryTime);
       const provider = await customers.getKYCProviderByAddress(accounts[1]);
       assert.equal(provider.name, 'Provider');
 
@@ -86,7 +87,7 @@ describe('Customers wrapper', () => {
     const kycProvider = accounts[1];
     const investor = accounts[2];
 
-    await makeKYCProvider(customers, accounts[1]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
     await polyToken.approve(investor, customers.address, new BigNumber(100));
     await customers.verifyCustomer(
       kycProvider,
@@ -113,7 +114,7 @@ describe('Customers wrapper', () => {
   });
 
   it('getCustomer should return null for nonexistent customer', async () => {
-    await makeKYCProvider(customers, accounts[1]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
 
     assert.equal(
       await customers.getCustomer(accounts[0], fakeAddress),
@@ -163,7 +164,7 @@ describe('Customers wrapper', () => {
     const kycProvider = accounts[1];
     const investor = accounts[2];
 
-    await makeKYCProvider(customers, accounts[1]);
+    await makeKYCProvider(customers, accounts[1], expiryTime);
 
     const logNewProvider = await logNewProviderArgsPromise;
     assert.equal(logNewProvider.providerAddress, kycProvider, 'kycProvider address wasnt found in event subscription');