Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype: (68 commits)
  Stop exporting ArtifactWriter
  Fix no-unused-variable tslint rule to include parameters and fix issues
  Fix linter exclude rule
  Validate all signature types rather then only ECSignatures
  Store the instantiated OrderValidationUtils
  Remove global hooks from tests and deploy contracts from within the specific tests
  Add EmitStatement to ASTVisitor
  Fix tslint issues
  Add back artifacts file
  Fix a bug in SolCompilerArtifacts adapter config overriding
  Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils
  export parseECSignature method
  Export ArtifactWriter from migrations package
  Remove unused artifact file
  Pass in generated contract wrapper to orderValidationUtils at instantiation
  Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one
  Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts.
  Increase timeout for contract migrations
  Remove some copy-paste code
  Await transactions in migrations
  ...

1 files changed, 47 insertions, 23 deletions

diff --git a/packages/contracts/test/zrx_token.ts b/packages/contracts/test/zrx_token.ts
index 996030000..0629c7a88 100644
--- a/packages/contracts/test/zrx_token.ts
+++ b/packages/contracts/test/zrx_token.ts
@@ -78,7 +78,10 @@ describe('ZRXToken', () => {
             const receiver = spender;
             const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
             const amountToTransfer = new BigNumber(1);
-            await zrxToken.transfer.sendTransactionAsync(receiver, amountToTransfer, { from: owner });
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.transfer.sendTransactionAsync(receiver, amountToTransfer, { from: owner }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
             const finalOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
             const finalReceiverBalance = await zrxToken.balanceOf.callAsync(receiver);
 
@@ -100,10 +103,13 @@ describe('ZRXToken', () => {
         it('should return false if owner has insufficient balance', async () => {
             const ownerBalance = await zrxToken.balanceOf.callAsync(owner);
             const amountToTransfer = ownerBalance.plus(1);
-            await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer, {
-                from: owner,
-                gas: constants.MAX_TOKEN_APPROVE_GAS,
-            });
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer, {
+                    from: owner,
+                    gas: constants.MAX_TOKEN_APPROVE_GAS,
+                }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
             const didReturnTrue = await zrxToken.transferFrom.callAsync(owner, spender, amountToTransfer, {
                 from: spender,
             });
@@ -136,14 +142,20 @@ describe('ZRXToken', () => {
             const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
             const amountToTransfer = initOwnerBalance;
             const initSpenderAllowance = MAX_UINT;
-            await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance, {
-                from: owner,
-                gas: constants.MAX_TOKEN_APPROVE_GAS,
-            });
-            await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
-                from: spender,
-                gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-            });
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance, {
+                    from: owner,
+                    gas: constants.MAX_TOKEN_APPROVE_GAS,
+                }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
+                    from: spender,
+                    gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+                }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
 
             const newSpenderAllowance = await zrxToken.allowance.callAsync(owner, spender);
             expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
@@ -154,11 +166,17 @@ describe('ZRXToken', () => {
             const initSpenderBalance = await zrxToken.balanceOf.callAsync(spender);
             const amountToTransfer = initOwnerBalance;
             const initSpenderAllowance = initOwnerBalance;
-            await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance);
-            await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
-                from: spender,
-                gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-            });
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
+                    from: spender,
+                    gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+                }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
 
             const newOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
             const newSpenderBalance = await zrxToken.balanceOf.callAsync(spender);
@@ -170,11 +188,17 @@ describe('ZRXToken', () => {
         it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
             const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
             const amountToTransfer = initOwnerBalance;
-            await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer);
-            await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
-                from: spender,
-                gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
-            });
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await web3Wrapper.awaitTransactionSuccessAsync(
+                await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, {
+                    from: spender,
+                    gas: constants.MAX_TOKEN_TRANSFERFROM_GAS,
+                }),
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
 
             const newSpenderAllowance = await zrxToken.allowance.callAsync(owner, spender);
             expect(newSpenderAllowance).to.be.bignumber.equal(0);