aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-01-30 21:06:43 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-01-30 23:01:37 +0800
commit5a4c0bff6a54f605040141b7b1a64c6a33a339b0 (patch)
tree207ce7123ea8f566687c78faaa4c2818c7939863 /packages/contracts
parent6205209fbbb5dbebbf225e1cef76c3e86117d356 (diff)
downloaddexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar.gz
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar.bz2
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar.lz
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar.xz
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.tar.zst
dexon-sol-tools-5a4c0bff6a54f605040141b7b1a64c6a33a339b0.zip
Remove accounts magic from tests
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/test/exchange/core.ts4
-rw-r--r--packages/contracts/test/exchange/helpers.ts3
-rw-r--r--packages/contracts/test/exchange/wrapper.ts5
3 files changed, 4 insertions, 8 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 0db4be830..e9182dd1b 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -54,9 +54,7 @@ describe('Exchange', () => {
before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
maker = accounts[0];
- tokenOwner = accounts[0];
- taker = accounts[1] || accounts[accounts.length - 1];
- feeRecipient = accounts[2] || accounts[accounts.length - 1];
+ [tokenOwner, taker, feeRecipient] = accounts;
[rep, dgd, zrx] = await Promise.all([
deployer.deployAsync(ContractName.DummyToken),
deployer.deployAsync(ContractName.DummyToken),
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts
index 047ab899a..5efce41a4 100644
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -30,8 +30,7 @@ describe('Exchange', () => {
before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
- maker = accounts[0];
- feeRecipient = accounts[1] || accounts[accounts.length - 1];
+ [maker, feeRecipient] = accounts;
const tokenRegistry = await deployer.deployAsync(ContractName.TokenRegistry);
const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy);
const [rep, dgd, zrx] = await Promise.all([
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 43cb622ac..acdf481a9 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -45,9 +45,8 @@ describe('Exchange', () => {
before(async () => {
const accounts = await web3Wrapper.getAvailableAddressesAsync();
- tokenOwner = maker = accounts[0];
- taker = accounts[1] || accounts[accounts.length - 1];
- feeRecipient = accounts[2] || accounts[accounts.length - 1];
+ tokenOwner = accounts[0];
+ [maker, taker, feeRecipient] = accounts;
[rep, dgd, zrx] = await Promise.all([
deployer.deployAsync(ContractName.DummyToken),
deployer.deployAsync(ContractName.DummyToken),