diff options
author | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:05:25 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:05:25 +0800 |
commit | 45f9ffd86c4878cf38c268933b0d30ff50f8a9c8 (patch) | |
tree | c9ca7ff492c5b7527509f1fe93d120d75ed6d1de /test/exchange_wrapper_test.ts | |
parent | 40208e3b2d6bdf465adf0d5a068b234991999646 (diff) | |
parent | 5925f81fe185a90efaa82dd90bd8d65d74326f11 (diff) | |
download | dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.gz dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.bz2 dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.lz dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.xz dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.zst dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.zip |
Merge branch 'master' into addEventSubscriptions
# Conflicts:
# src/types.ts
# test/exchange_wrapper_test.ts
# test/utils/fill_scenarios.ts
Diffstat (limited to 'test/exchange_wrapper_test.ts')
-rw-r--r-- | test/exchange_wrapper_test.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index ab6f2df67..a44d2728a 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -32,11 +32,11 @@ const NON_EXISTENT_ORDER_HASH = '0x79370342234e7acd6bbeac335bd3bb1d368383294b64b describe('ExchangeWrapper', () => { let web3: Web3; let zeroEx: ZeroEx; - let userAddresses: string[]; let tokenUtils: TokenUtils; let tokens: Token[]; - let fillScenarios: FillScenarios; + let userAddresses: string[]; let zrxTokenAddress: string; + let fillScenarios: FillScenarios; before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3); |