Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix

1 files changed, 49 insertions, 26 deletions

diff --git a/packages/contracts/test/zrx_token.ts b/packages/contracts/test/zrx_token.ts
index fe37e802b..0629c7a88 100644
--- a/packages/contracts/test/zrx_token.ts
+++ b/packages/contracts/test/zrx_token.ts
@@ -1,11 +1,10 @@
-import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
+import { BlockchainLifecycle } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import 'make-promises-safe';
-import * as Web3 from 'web3';
 
-import { ZRXTokenContract } from '../src/contract_wrappers/generated/zrx_token';
+import { ZRXTokenContract } from '../src/generated_contract_wrappers/zrx_token';
 import { artifacts } from '../src/utils/artifacts';
 import { chaiSetup } from '../src/utils/chai_setup';
 import { constants } from '../src/utils/constants';
@@ -79,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);
 
@@ -101,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,
             });
@@ -137,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);
@@ -155,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);
@@ -171,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);