crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #679 from 0xProject/fix/await-transactions

Browse Source 
Add missing awaitTransactionSuccessAsync calls
This commit is contained in:
Leonid Logvinov
2018-06-07 15:34:46 -07:00
committed by GitHub
parent 9bc6ebde4e 0ddaabe377
commit 78d8526e41
2 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/contracts/test/exchange/transactions.ts
View File

@@ -216,6 +216,7 @@ describe('Exchange transactions', () => {
await exchange.setSignatureValidatorApproval.sendTransactionAsync(whitelist.address, isApproved, { await exchange.setSignatureValidatorApproval.sendTransactionAsync(whitelist.address, isApproved, {
from: takerAddress, from: takerAddress,
}), }),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
const defaultOrderParams = { const defaultOrderParams = {
...constants.STATIC_ORDER_PARAMS, ...constants.STATIC_ORDER_PARAMS,
@@ -238,6 +239,7 @@ describe('Exchange transactions', () => {
const isApproved = true; const isApproved = true;
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await whitelist.updateWhitelistStatus.sendTransactionAsync(takerAddress, isApproved, { from: owner }), await whitelist.updateWhitelistStatus.sendTransactionAsync(takerAddress, isApproved, { from: owner }),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder); orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
@@ -258,6 +260,7 @@ describe('Exchange transactions', () => {
const isApproved = true; const isApproved = true;
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await whitelist.updateWhitelistStatus.sendTransactionAsync(makerAddress, isApproved, { from: owner }), await whitelist.updateWhitelistStatus.sendTransactionAsync(makerAddress, isApproved, { from: owner }),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder); orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
@@ -278,10 +281,12 @@ describe('Exchange transactions', () => {
const isApproved = true; const isApproved = true;
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await whitelist.updateWhitelistStatus.sendTransactionAsync(makerAddress, isApproved, { from: owner }), await whitelist.updateWhitelistStatus.sendTransactionAsync(makerAddress, isApproved, { from: owner }),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await whitelist.updateWhitelistStatus.sendTransactionAsync(takerAddress, isApproved, { from: owner }), await whitelist.updateWhitelistStatus.sendTransactionAsync(takerAddress, isApproved, { from: owner }),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder); orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder);
@@ -295,6 +300,7 @@ describe('Exchange transactions', () => {
signedOrder.signature, signedOrder.signature,
{ from: takerAddress }, { from: takerAddress },
), ),
constants.AWAIT_TRANSACTION_MINED_MS,
); );
const newBalances = await erc20Wrapper.getBalancesAsync(); const newBalances = await erc20Wrapper.getBalancesAsync();

70
packages/contracts/test/zrx_token.ts
View File

@@ -78,7 +78,10 @@ describe('ZRXToken', () => {
const receiver = spender; const receiver = spender;
const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner); const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
const amountToTransfer = new BigNumber(1); 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 finalOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
const finalReceiverBalance = await zrxToken.balanceOf.callAsync(receiver); const finalReceiverBalance = await zrxToken.balanceOf.callAsync(receiver);
@@ -100,10 +103,13 @@ describe('ZRXToken', () => {
it('should return false if owner has insufficient balance', async () => { it('should return false if owner has insufficient balance', async () => {
const ownerBalance = await zrxToken.balanceOf.callAsync(owner); const ownerBalance = await zrxToken.balanceOf.callAsync(owner);
const amountToTransfer = ownerBalance.plus(1); const amountToTransfer = ownerBalance.plus(1);
await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer, { await web3Wrapper.awaitTransactionSuccessAsync(
from: owner, await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer, {
gas: constants.MAX_TOKEN_APPROVE_GAS, from: owner,
}); gas: constants.MAX_TOKEN_APPROVE_GAS,
}),
constants.AWAIT_TRANSACTION_MINED_MS,
);
const didReturnTrue = await zrxToken.transferFrom.callAsync(owner, spender, amountToTransfer, { const didReturnTrue = await zrxToken.transferFrom.callAsync(owner, spender, amountToTransfer, {
from: spender, from: spender,
}); });
@@ -136,14 +142,20 @@ describe('ZRXToken', () => {
const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner); const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
const amountToTransfer = initOwnerBalance; const amountToTransfer = initOwnerBalance;
const initSpenderAllowance = MAX_UINT; const initSpenderAllowance = MAX_UINT;
await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance, { await web3Wrapper.awaitTransactionSuccessAsync(
from: owner, await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance, {
gas: constants.MAX_TOKEN_APPROVE_GAS, from: owner,
}); gas: constants.MAX_TOKEN_APPROVE_GAS,
await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, { }),
from: spender, constants.AWAIT_TRANSACTION_MINED_MS,
gas: constants.MAX_TOKEN_TRANSFERFROM_GAS, );
}); 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); const newSpenderAllowance = await zrxToken.allowance.callAsync(owner, spender);
expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance); expect(initSpenderAllowance).to.be.bignumber.equal(newSpenderAllowance);
@@ -154,11 +166,17 @@ describe('ZRXToken', () => {
const initSpenderBalance = await zrxToken.balanceOf.callAsync(spender); const initSpenderBalance = await zrxToken.balanceOf.callAsync(spender);
const amountToTransfer = initOwnerBalance; const amountToTransfer = initOwnerBalance;
const initSpenderAllowance = initOwnerBalance; const initSpenderAllowance = initOwnerBalance;
await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance); await web3Wrapper.awaitTransactionSuccessAsync(
await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, { await zrxToken.approve.sendTransactionAsync(spender, initSpenderAllowance),
from: spender, constants.AWAIT_TRANSACTION_MINED_MS,
gas: constants.MAX_TOKEN_TRANSFERFROM_GAS, );
}); 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 newOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
const newSpenderBalance = await zrxToken.balanceOf.callAsync(spender); 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 () => { it('should modify allowance if spender has sufficient allowance less than 2^256 - 1', async () => {
const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner); const initOwnerBalance = await zrxToken.balanceOf.callAsync(owner);
const amountToTransfer = initOwnerBalance; const amountToTransfer = initOwnerBalance;
await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer); await web3Wrapper.awaitTransactionSuccessAsync(
await zrxToken.transferFrom.sendTransactionAsync(owner, spender, amountToTransfer, { await zrxToken.approve.sendTransactionAsync(spender, amountToTransfer),
from: spender, constants.AWAIT_TRANSACTION_MINED_MS,
gas: constants.MAX_TOKEN_TRANSFERFROM_GAS, );
}); 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); const newSpenderAllowance = await zrxToken.allowance.callAsync(owner, spender);
expect(newSpenderAllowance).to.be.bignumber.equal(0); expect(newSpenderAllowance).to.be.bignumber.equal(0);