aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-05-23 02:48:41 +0800
committerGitHub <noreply@github.com>2018-05-23 02:48:41 +0800
commitcde85243d6eaf9376f499aa1cc28bd393130c2b9 (patch)
tree168bde1ea63c4c5c3c4741ca486a2f43c58fab4e /packages/contracts/test/exchange/transactions.ts
parentc579db1a7bec0b5fdec8d120121375224de46d5d (diff)
parente26c0c58aeb435e4fbec1b111b77d51b67dacdbe (diff)
downloaddexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar.gz
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar.bz2
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar.lz
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar.xz
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.tar.zst
dexon-sol-tools-cde85243d6eaf9376f499aa1cc28bd393130c2b9.zip
Merge pull request #601 from 0xProject/contracts-test-fixes
Contracts test fixes
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
-rw-r--r--packages/contracts/test/exchange/transactions.ts11
1 files changed, 10 insertions, 1 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 482475554..798c8283b 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -62,6 +62,12 @@ describe('Exchange transactions', () => {
let zeroEx: ZeroEx;
before(async () => {
+ await blockchainLifecycle.startAsync();
+ });
+ after(async () => {
+ await blockchainLifecycle.revertAsync();
+ });
+ before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const usedAddresses = ([owner, senderAddress, makerAddress, takerAddress, feeRecipientAddress] = accounts);
@@ -84,7 +90,10 @@ describe('Exchange transactions', () => {
exchangeWrapper = new ExchangeWrapper(exchange, zeroEx);
await exchangeWrapper.registerAssetProxyAsync(AssetProxyId.ERC20, erc20Proxy.address, owner);
- await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner });
+ await web3Wrapper.awaitTransactionMinedAsync(
+ await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }),
+ constants.AWAIT_TRANSACTION_MINED_MS,
+ );
defaultMakerTokenAddress = erc20TokenA.address;
defaultTakerTokenAddress = erc20TokenB.address;