aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-09-26 21:37:14 +0800
committerFabio Berger <me@fabioberger.com>2017-09-26 21:37:14 +0800
commitad6e84882146af1164e4729db3bf43c4d8cde5db (patch)
tree5b0633382326cbee8f7d68073cce444192e8a0bc
parent9ee88ba06dfd874feb4fdf54b0fb09b7c1951dfd (diff)
downloaddexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar.gz
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar.bz2
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar.lz
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar.xz
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.tar.zst
dexon-sol-tools-ad6e84882146af1164e4729db3bf43c4d8cde5db.zip
fix merge issue
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index d2a3bcfa3..6d4d90441 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -637,7 +637,7 @@ export class ExchangeWrapper extends ContractWrapper {
signedOrder: SignedOrder, opts?: ValidateOrderFillableOpts,
): Promise<void> {
assert.doesConformToSchema('signedOrder', signedOrder, schemas.signedOrderSchema);
- const zrxTokenAddress = await this._getZRXTokenAddressAsync();
+ const zrxTokenAddress = await this.getZRXTokenAddressAsync();
const expectedFillTakerTokenAmount = !_.isUndefined(opts) ? opts.expectedFillTakerTokenAmount : undefined;
await this._orderValidationUtils.validateOrderFillableOrThrowAsync(
signedOrder, zrxTokenAddress, expectedFillTakerTokenAmount,