diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-02-09 09:48:06 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:16 +0800 |
commit | 9e2f8bead9a51a4c30b77781ae3b39bed31c36ee (patch) | |
tree | 5f593087ce3eeb643dfcb16b139cc6f23a2fd471 /packages/contracts/test/exchange/core.ts | |
parent | 942867179c05e901450a7a08872dd523122a2f81 (diff) | |
download | dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar.gz dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar.bz2 dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar.lz dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar.xz dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.tar.zst dexon-sol-tools-9e2f8bead9a51a4c30b77781ae3b39bed31c36ee.zip |
Merge development
Diffstat (limited to 'packages/contracts/test/exchange/core.ts')
-rw-r--r-- | packages/contracts/test/exchange/core.ts | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index d8d83711e..4fd837d51 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -441,11 +441,10 @@ describe('Exchange', () => { expect(signedOrder.feeRecipient).to.be.equal(logArgs.feeRecipient); expect(signedOrder.makerTokenAddress).to.be.equal(logArgs.makerToken); expect(signedOrder.takerTokenAddress).to.be.equal(logArgs.takerToken); - expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount); - expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount); + expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerTokenFilledAmount); + expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerTokenFilledAmount); expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.makerFeePaid); expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.takerFeePaid); - expect(expectedTokens).to.be.equal(logArgs.tokens); expect(ZeroEx.getOrderHashHex(signedOrder)).to.be.equal(logArgs.orderHash); }); @@ -472,11 +471,10 @@ describe('Exchange', () => { expect(signedOrder.feeRecipient).to.be.equal(logArgs.feeRecipient); expect(signedOrder.makerTokenAddress).to.be.equal(logArgs.makerToken); expect(signedOrder.takerTokenAddress).to.be.equal(logArgs.takerToken); - expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.filledMakerTokenAmount); - expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.filledTakerTokenAmount); + expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerTokenFilledAmount); + expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerTokenFilledAmount); expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.makerFeePaid); expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.takerFeePaid); - expect(expectedTokens).to.be.equal(logArgs.tokens); expect(ZeroEx.getOrderHashHex(signedOrder)).to.be.equal(logArgs.orderHash); }); @@ -764,7 +762,7 @@ describe('Exchange', () => { takerTokenFillAmount: signedOrder.takerTokenAmount, }); const log = res.logs[0] as LogWithDecodedArgs<LogFillContractEventArgs>; - expect(log.args.filledTakerTokenAmount).to.be.bignumber.equal( + expect(log.args.takerTokenFilledAmount).to.be.bignumber.equal( signedOrder.takerTokenAmount.minus(takerTokenCancelAmount), ); @@ -819,9 +817,8 @@ describe('Exchange', () => { expect(signedOrder.feeRecipient).to.be.equal(logArgs.feeRecipient); expect(signedOrder.makerTokenAddress).to.be.equal(logArgs.makerToken); expect(signedOrder.takerTokenAddress).to.be.equal(logArgs.takerToken); - expect(expectedCancelledMakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledMakerTokenAmount); - expect(expectedCancelledTakerTokenAmount).to.be.bignumber.equal(logArgs.cancelledTakerTokenAmount); - expect(expectedTokens).to.be.equal(logArgs.tokens); + expect(expectedCancelledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerTokenCancelledAmount); + expect(expectedCancelledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerTokenCancelledAmount); expect(ZeroEx.getOrderHashHex(signedOrder)).to.be.equal(logArgs.orderHash); }); |