aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-06-10 00:13:57 +0800
committerGitHub <noreply@github.com>2017-06-10 00:13:57 +0800
commit876f6ac343a2d43df0e5f276d0950ecc97d42c78 (patch)
treea7941a43f912f123564ea91e3df0541d153ff369 /src
parent603d7c56d3466206cb79205e47168f9ec81ec0fe (diff)
parentaf36ceb0b8f2d8c734b15158e69ba7bfb5fdc5a4 (diff)
downloaddexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar.gz
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar.bz2
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar.lz
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar.xz
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.tar.zst
dexon-sol-tools-876f6ac343a2d43df0e5f276d0950ecc97d42c78.zip
Merge branch 'master' into json-schema
Diffstat (limited to 'src')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index c7d0f2e84..96e0ac38d 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -339,11 +339,10 @@ export class ExchangeWrapper extends ContractWrapper {
await assert.isSenderAddressAsync('takerAddress', takerAddress, this.web3Wrapper);
assert.doesConformToSchema('orderFillOrKillRequests', orderFillOrKillRequests, orderFillOrKillRequestsSchema);
const exchangeInstance = await this.getExchangeContractAsync();
- _.each(orderFillOrKillRequests, request => {
- this.validateFillOrKillOrderAndThrowIfInvalidAsync(request.signedOrder,
- exchangeInstance.address,
- request.fillTakerAmount);
- });
+ for (const request of orderFillOrKillRequests) {
+ await this.validateFillOrKillOrderAndThrowIfInvalidAsync(request.signedOrder, exchangeInstance.address,
+ request.fillTakerAmount);
+ }
const orderAddressesValuesAndTakerTokenFillAmounts = _.map(orderFillOrKillRequests, request => {
return [