aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-23 05:15:25 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-23 05:15:25 +0800
commit438b82183514322d696bfcbae53f4eae4cda0bcf (patch)
tree59118f72e1d2393fbbb31aa35c8c454162b557b7
parentc52d6753cefcc6b55a6683e5a1c45ed62f698dc3 (diff)
downloaddexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar.gz
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar.bz2
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar.lz
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar.xz
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.tar.zst
dexon-sol-tools-438b82183514322d696bfcbae53f4eae4cda0bcf.zip
Fix incorrect merge consequences
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index d6de801a3..5d514e5ec 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -205,7 +205,7 @@ export class ExchangeWrapper extends ContractWrapper {
@decorators.contractCallErrorHandler
public async fillOrdersUpToAsync(signedOrders: SignedOrder[], takerTokenFillAmount: BigNumber.BigNumber,
shouldCheckTransfer: boolean, takerAddress: string): Promise<BigNumber.BigNumber> {
- const takerTokenAddresses = _map(signedOrders, signedOrder => signedOrder.takerTokenAddress);
+ const takerTokenAddresses = _.map(signedOrders, signedOrder => signedOrder.takerTokenAddress);
assert.hasAtMostOneUniqueValue(takerTokenAddresses,
ExchangeContractErrs.MULTIPLE_TAKER_TOKENS_IN_FILL_UP_TO_DISALLOWED);
assert.isBigNumber('takerTokenFillAmount', takerTokenFillAmount);
@@ -216,7 +216,7 @@ export class ExchangeWrapper extends ContractWrapper {
await this._validateFillOrderAndThrowIfInvalidAsync(
signedOrder, takerTokenFillAmount, takerAddress);
}
- if (_isEmpty(signedOrders)) {
+ if (_.isEmpty(signedOrders)) {
return new BigNumber(0); // no-op
}
@@ -261,7 +261,7 @@ export class ExchangeWrapper extends ContractWrapper {
);
this._throwErrorLogsAsErrors(response.logs);
let filledTakerTokenAmount = new BigNumber(0);
- const filledAmounts = each(response.logs, log => {
+ const filledAmounts = _.each(response.logs, log => {
filledTakerTokenAmount = filledTakerTokenAmount.plus((log.args as LogFillContractEventArgs).filledValueT);
});
return filledTakerTokenAmount;