diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-23 01:53:04 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-24 05:13:36 +0800 |
| commit | 4fe28ec53c4e84544c3c21853dff57c4c6a4e45d (patch) | |
| tree | 4b44732136d006aa550bef0f8c4c60a980e18771 /packages/0x.js/test | |
| parent | efe8e07854ac5527725350e871dab370d022ae01 (diff) | |
| download | dexon-0x-contracts-4fe28ec53c4e84544c3c21853dff57c4c6a4e45d.tar.gz dexon-0x-contracts-4fe28ec53c4e84544c3c21853dff57c4c6a4e45d.tar.zst dexon-0x-contracts-4fe28ec53c4e84544c3c21853dff57c4c6a4e45d.zip | |
Make zeroEx.exchange.getContractAddress non-async
Diffstat (limited to 'packages/0x.js/test')
| -rw-r--r-- | packages/0x.js/test/0x.js_test.ts | 3 | ||||
| -rw-r--r-- | packages/0x.js/test/artifacts_test.ts | 4 | ||||
| -rw-r--r-- | packages/0x.js/test/exchange_wrapper_test.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/test/order_state_watcher_test.ts | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts index 94387e740..95a8b027d 100644 --- a/packages/0x.js/test/0x.js_test.ts +++ b/packages/0x.js/test/0x.js_test.ts @@ -240,8 +240,7 @@ describe('ZeroEx library', () => { networkId: constants.TESTRPC_NETWORK_ID, }; const zeroExWithWrongExchangeAddress = new ZeroEx(web3.currentProvider, zeroExConfig); - return expect(zeroExWithWrongExchangeAddress.exchange.getContractAddressAsync()) - .to.be.rejectedWith(ZeroExError.ContractDoesNotExist); + expect(zeroExWithWrongExchangeAddress.exchange.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS); }); it('allows to specify ether token contract address', async () => { const zeroExConfig = { diff --git a/packages/0x.js/test/artifacts_test.ts b/packages/0x.js/test/artifacts_test.ts index 1c36fb358..265a71715 100644 --- a/packages/0x.js/test/artifacts_test.ts +++ b/packages/0x.js/test/artifacts_test.ts @@ -29,7 +29,7 @@ describe('Artifacts', () => { await (zeroEx.token as any)._getTokenTransferProxyAddressAsync(); }).timeout(TIMEOUT); it('exchange contract is deployed', async () => { - await zeroEx.exchange.getContractAddressAsync(); + await (zeroEx.exchange as any)._getExchangeContractAsync(); }).timeout(TIMEOUT); }); describe('contracts are deployed on ropsten', () => { @@ -49,7 +49,7 @@ describe('Artifacts', () => { await (zeroEx.token as any)._getTokenTransferProxyAddressAsync(); }).timeout(TIMEOUT); it('exchange contract is deployed', async () => { - await zeroEx.exchange.getContractAddressAsync(); + await (zeroEx.exchange as any)._getExchangeContractAsync(); }).timeout(TIMEOUT); }); }); diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts index 5d1ff8f50..c1f9316c4 100644 --- a/packages/0x.js/test/exchange_wrapper_test.ts +++ b/packages/0x.js/test/exchange_wrapper_test.ts @@ -45,7 +45,7 @@ describe('ExchangeWrapper', () => { before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider, config); - exchangeContractAddress = await zeroEx.exchange.getContractAddressAsync(); + exchangeContractAddress = zeroEx.exchange.getContractAddress(); userAddresses = await zeroEx.getAvailableAddressesAsync(); tokens = await zeroEx.tokenRegistry.getTokensAsync(); tokenUtils = new TokenUtils(tokens); diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts index 887fc8605..fd94a3df6 100644 --- a/packages/0x.js/test/order_state_watcher_test.ts +++ b/packages/0x.js/test/order_state_watcher_test.ts @@ -56,7 +56,7 @@ describe('OrderStateWatcher', () => { before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3.currentProvider, config); - exchangeContractAddress = await zeroEx.exchange.getContractAddressAsync(); + exchangeContractAddress = zeroEx.exchange.getContractAddress(); userAddresses = await zeroEx.getAvailableAddressesAsync(); [, maker, taker] = userAddresses; tokens = await zeroEx.tokenRegistry.getTokensAsync(); |