diff options
author | Fabio Berger <me@fabioberger.com> | 2017-07-11 15:30:55 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-07-11 15:30:55 +0800 |
commit | 56bedf724fb25f858b5aaefbb61562c4896defc1 (patch) | |
tree | 51a414c2280693b6ec36ec7109c3fd90d3c42082 /test | |
parent | b98f3fc09485aaba56a2ce244dd2e27c59928cd8 (diff) | |
parent | 054843d599129e3dbb2eb36a402eff66064ed78f (diff) | |
download | dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar.gz dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar.bz2 dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar.lz dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar.xz dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.tar.zst dexon-sol-tools-56bedf724fb25f858b5aaefbb61562c4896defc1.zip |
Merge branch 'new-contracts'
* new-contracts: (29 commits)
Fix a typo
Fix a typo in comment
Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowance
Simplify BigNumber hack
use yarn on CI
Upgrade to a new node version
Make CONTRACTS_COMMIT_HASH a string
Use never testrpc snapshot
Migrate the rest of the artifacts
Change arguments order at isRoundingError
Migrate events
Migrate constructor arguments
Migrate fillOrKillOrder
Migrate ZRX_TOKEN_AMOUNT
Migrate getUnavailableTakerTokenAmount
Migrate PROXY_CONTRACT
Migrate batchFillOrKillOrders
Migrate batchFillOrders
Migrate fillOrder
Migrate fillOrdersUpTo and remove min
...
Diffstat (limited to 'test')
-rw-r--r-- | test/exchange_wrapper_test.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 53032efd6..ed2e45abf 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -785,10 +785,10 @@ describe('ExchangeWrapper', () => { ); zeroExEvent.watch((err: Error, event: ContractEvent) => { const args = event.args as LogFillContractEventArgs; - expect(args.filledValueM.isBigNumber).to.be.true(); - expect(args.filledValueT.isBigNumber).to.be.true(); - expect(args.feeMPaid.isBigNumber).to.be.true(); - expect(args.feeTPaid.isBigNumber).to.be.true(); + expect(args.filledMakerTokenAmount.isBigNumber).to.be.true(); + expect(args.filledTakerTokenAmount.isBigNumber).to.be.true(); + expect(args.paidMakerFee.isBigNumber).to.be.true(); + expect(args.paidTakerFee.isBigNumber).to.be.true(); done(); }); await zeroEx.exchange.fillOrderAsync( |