aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-26 14:43:37 +0800
committerFabio Berger <me@fabioberger.com>2018-06-26 14:43:37 +0800
commit105b9273975b34d46dc98254846d2b31990d9d9a (patch)
tree2a099d173df79d6ce0f37960977b39ebc61eecc7 /packages/contracts/test
parent9219f9d8ae2166c7c7b1d0a4ede78890094a3831 (diff)
downloaddexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar.gz
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar.bz2
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar.lz
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar.xz
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.tar.zst
dexon-0x-contracts-105b9273975b34d46dc98254846d2b31990d9d9a.zip
Fix merge issues
Diffstat (limited to 'packages/contracts/test')
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts
index 7960e46d2..5f4c5b597 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/packages/contracts/test/asset_proxy/proxies.ts
@@ -62,7 +62,10 @@ describe('Asset Transfer Proxies', () => {
erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
- [zrxToken] = await erc20Wrapper.deployDummyTokensAsync();
+ [zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+ constants.NUM_DUMMY_ERC20_TO_DEPLOY,
+ constants.DUMMY_TOKEN_DECIMALS,
+ );
erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync();
await web3Wrapper.awaitTransactionSuccessAsync(