aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-19 23:38:15 +0800
committerFabio Berger <me@fabioberger.com>2018-06-19 23:38:15 +0800
commit9acf4458c026ca9e2748ca4291573ac95c66fe26 (patch)
tree1e137e009863ce74ae73b6261e873ff888cccd44 /packages/contracts/test/exchange
parent70de264d4dd96efce2719c209c4b866c93668877 (diff)
downloaddexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar.gz
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar.bz2
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar.lz
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar.xz
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.tar.zst
dexon-sol-tools-9acf4458c026ca9e2748ca4291573ac95c66fe26.zip
Remove hack in ERC20Wrapper
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/core.ts5
-rw-r--r--packages/contracts/test/exchange/dispatcher.ts5
-rw-r--r--packages/contracts/test/exchange/match_orders.ts5
-rw-r--r--packages/contracts/test/exchange/transactions.ts5
-rw-r--r--packages/contracts/test/exchange/wrapper.ts5
5 files changed, 20 insertions, 5 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 453f05df2..64b7bf943 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -72,7 +72,10 @@ describe('Exchange core', () => {
erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
- [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync();
+ [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+ constants.NUM_DUMMY_ERC20_TO_DEPLOY,
+ constants.DUMMY_TOKEN_DECIMALS,
+ );
erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync();
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts
index abbfd7ac7..0e2b82f19 100644
--- a/packages/contracts/test/exchange/dispatcher.ts
+++ b/packages/contracts/test/exchange/dispatcher.ts
@@ -48,7 +48,10 @@ describe('AssetProxyDispatcher', () => {
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();
diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index b8dca04fd..4ed4f2266 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -81,7 +81,10 @@ describe('matchOrders', () => {
erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
// Deploy ERC20 token & ERC20 proxy
- [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync();
+ [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+ constants.NUM_DUMMY_ERC20_TO_DEPLOY,
+ constants.DUMMY_TOKEN_DECIMALS,
+ );
erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync();
// Deploy ERC721 token and proxy
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 21ff123e5..beb7054e7 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -64,7 +64,10 @@ describe('Exchange transactions', () => {
erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
- [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync();
+ [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+ constants.NUM_DUMMY_ERC20_TO_DEPLOY,
+ constants.DUMMY_TOKEN_DECIMALS,
+ );
erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync();
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 00c5e4352..6f03c7f6f 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -66,7 +66,10 @@ describe('Exchange wrappers', () => {
erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
- [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync();
+ [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+ constants.NUM_DUMMY_ERC20_TO_DEPLOY,
+ constants.DUMMY_TOKEN_DECIMALS,
+ );
erc20Proxy = await erc20Wrapper.deployProxyAsync();
await erc20Wrapper.setBalancesAndAllowancesAsync();