diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-09 01:21:46 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-09 01:22:48 +0800 |
commit | a786776d7cf52ab70d54e0dc421dc645a412b3c7 (patch) | |
tree | 7283487385f2e966f9e3453b176713479061c4d6 /src/contract_wrappers/exchange_wrapper.ts | |
parent | c94485dfbba388f481ca6c10bd62b863d7429223 (diff) | |
download | dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar.gz dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar.bz2 dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar.lz dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar.xz dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.tar.zst dexon-0x-contracts-a786776d7cf52ab70d54e0dc421dc645a412b3c7.zip |
Add assert.hashAtMostOneUniqueValue
Diffstat (limited to 'src/contract_wrappers/exchange_wrapper.ts')
-rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index a7d1f52ae..aa79729c3 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -161,15 +161,15 @@ export class ExchangeWrapper extends ContractWrapper { this.throwErrorLogsAsErrors(response.logs); } /** - * Sequentially and atomically fills signedOrders up to takerTokenFillAmount. - * If fill amount is reached - it succeeds and doesn't fill the rest of the orders. - * If fill amount is not reached - it just fills all the orders. + * Sequentially and atomically fills signedOrders up to the specified takerTokenFillAmount. + * If the fill amount is reached - it succeeds and does not fill the rest of the orders. + * If fill amount is not reached - it fills as much of the fill amount as possible and succeeds. */ public async fillOrdersUpToAsync(signedOrders: SignedOrder[], takerTokenFillAmount: BigNumber.BigNumber, shouldCheckTransfer: boolean, takerAddress: string): Promise<void> { const takerTokenAddresses = _.map(signedOrders, signedOrder => signedOrder.takerTokenAddress); - assert.assert(_.uniq(takerTokenAddresses).length <= 1, - ExchangeContractErrs.MULTIPLE_TAKER_TOKENS_IN_FILL_UP_TO); + assert.hashAtMostOneUniqueValue(takerTokenAddresses, + ExchangeContractErrs.MULTIPLE_TAKER_TOKENS_IN_FILL_UP_TO_DISALLOWED); assert.isBigNumber('takerTokenFillAmount', takerTokenFillAmount); assert.isBoolean('shouldCheckTransfer', shouldCheckTransfer); await assert.isSenderAddressAsync('takerAddress', takerAddress, this.web3Wrapper); @@ -433,7 +433,7 @@ export class ExchangeWrapper extends ContractWrapper { */ public async batchCancelOrderAsync(orderCancellationRequests: OrderCancellationRequest[]): Promise<void> { const makers = _.map(orderCancellationRequests, cancellationRequest => cancellationRequest.order.maker); - assert.assert(_.uniq(makers).length <= 1, ExchangeContractErrs.MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH); + assert.hashAtMostOneUniqueValue(makers, ExchangeContractErrs.MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH); const maker = makers[0]; await assert.isSenderAddressAsync('maker', maker, this.web3Wrapper); _.forEach(orderCancellationRequests, |