diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-06-10 01:50:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-10 01:50:12 +0800 |
commit | f4c6097f2435affa0bef70778d22317a0979e365 (patch) | |
tree | e9455c240a4463c5d0868694d8269713c162aed1 /test/exchange_wrapper_test.ts | |
parent | 14d7e6bbbe62527fdd90397f83bbd3f9af4187b4 (diff) | |
parent | d36930a04dd22bc17758b369241a5602bf1f6936 (diff) | |
download | dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar.gz dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar.bz2 dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar.lz dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar.xz dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.tar.zst dexon-0x-contracts-f4c6097f2435affa0bef70778d22317a0979e365.zip |
Merge branch 'master' into subscribe-async-tests
Diffstat (limited to 'test/exchange_wrapper_test.ts')
-rw-r--r-- | test/exchange_wrapper_test.ts | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 3ee8ff188..1b97d7b05 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -531,6 +531,7 @@ describe('ExchangeWrapper', () => { let fillableAmount: BigNumber.BigNumber; let partialFillAmount: BigNumber.BigNumber; let signedOrder: SignedOrder; + let orderHash: string; before(() => { takerAddress = userAddresses[1]; const [makerToken, takerToken] = tokens; @@ -543,6 +544,7 @@ describe('ExchangeWrapper', () => { signedOrder = await fillScenarios.createPartiallyFilledSignedOrderAsync( makerTokenAddress, takerTokenAddress, takerAddress, fillableAmount, partialFillAmount, ); + orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); }); describe('#getUnavailableTakerAmountAsync', () => { it ('should throw if passed an invalid orderHash', async () => { @@ -554,7 +556,6 @@ describe('ExchangeWrapper', () => { expect(unavailableValueT).to.be.bignumber.equal(0); }); it ('should return the unavailableValueT for a valid and partially filled orderHash', async () => { - const orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); const unavailableValueT = await zeroEx.exchange.getUnavailableTakerAmountAsync(orderHash); expect(unavailableValueT).to.be.bignumber.equal(partialFillAmount); }); @@ -569,7 +570,6 @@ describe('ExchangeWrapper', () => { expect(filledValueT).to.be.bignumber.equal(0); }); it ('should return the filledValueT for a valid and partially filled orderHash', async () => { - const orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); const filledValueT = await zeroEx.exchange.getFilledTakerAmountAsync(orderHash); expect(filledValueT).to.be.bignumber.equal(partialFillAmount); }); @@ -584,10 +584,15 @@ describe('ExchangeWrapper', () => { expect(cancelledValueT).to.be.bignumber.equal(0); }); it ('should return the cancelledValueT for a valid and partially filled orderHash', async () => { - const orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); const cancelledValueT = await zeroEx.exchange.getCanceledTakerAmountAsync(orderHash); expect(cancelledValueT).to.be.bignumber.equal(0); }); + it ('should return the cancelledValueT for a valid and cancelled orderHash', async () => { + const cancelAmount = fillableAmount.minus(partialFillAmount); + await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelAmount); + const cancelledValueT = await zeroEx.exchange.getCanceledTakerAmountAsync(orderHash); + expect(cancelledValueT).to.be.bignumber.equal(cancelAmount); + }); }); }); describe('#subscribeAsync', () => { |