aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-07-08 05:08:34 +0800
committerGitHub <noreply@github.com>2017-07-08 05:08:34 +0800
commit0876fc6cabb914c6db5206182c8bd8d747b40674 (patch)
treebe3ffb112ade307d4e93fc4d7bafa5c86244a53c /src
parent90ddfe58a99eb241a86dff64f31263994c00ce2c (diff)
parent6593ddf35cdcd7f474ea0cd108c19f673bdc441c (diff)
downloaddexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar.gz
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar.bz2
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar.lz
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar.xz
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.tar.zst
dexon-0x-contracts-0876fc6cabb914c6db5206182c8bd8d747b40674.zip
Merge branch 'master' into cache_net_version
Diffstat (limited to 'src')
-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 2353c826a..fa4b5904b 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -297,8 +297,8 @@ export class ExchangeWrapper extends ContractWrapper {
* Must be available via the supplied Web3.Provider passed to 0x.js.
*/
@decorators.contractCallErrorHandler
- public async batchFillOrderAsync(orderFillRequests: OrderFillRequest[],
- shouldCheckTransfer: boolean, takerAddress: string): Promise<void> {
+ public async batchFillOrdersAsync(orderFillRequests: OrderFillRequest[],
+ shouldCheckTransfer: boolean, takerAddress: string): Promise<void> {
assert.doesConformToSchema('orderFillRequests', orderFillRequests, orderFillRequestsSchema);
const exchangeContractAddresses = _.map(
orderFillRequests,
@@ -520,7 +520,7 @@ export class ExchangeWrapper extends ContractWrapper {
* interface.
*/
@decorators.contractCallErrorHandler
- public async batchCancelOrderAsync(orderCancellationRequests: OrderCancellationRequest[]): Promise<void> {
+ public async batchCancelOrdersAsync(orderCancellationRequests: OrderCancellationRequest[]): Promise<void> {
assert.doesConformToSchema('orderCancellationRequests', orderCancellationRequests,
orderCancellationRequestsSchema);
const exchangeContractAddresses = _.map(