diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2017-11-15 01:29:46 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2017-11-15 01:29:46 +0800 |
commit | 9bb5e6f5ce199acde620a0fb8f36f585e1c763e9 (patch) | |
tree | 125f6d75b0e664208d5fef11694d9e982a932c45 /packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | |
parent | 56b5619d24b44d23f770b58b0c9e1d4a63b89aca (diff) | |
parent | 05de07496fe3f9089b4c96b0594b234afc436304 (diff) | |
download | dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.gz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.bz2 dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.lz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.xz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.zst dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.zip |
Merge branch 'development' into feature/addJsonSchemas
* development:
Improve description
Alphabetize
Add exit 0 to 0x.js build command
Add snapshot save and revert to order_state_watcher_test.ts
Fix changelog
Use tslint v5.8.0 everywhere and use the tslint-config sub-package instead of the old repo as a dep. in the rest of the sub-packages.
Add tslint-config sub-package
Fix tslint issue
Public interface has changed, moved to minor version
Update changelog
Renamed canceled to cancelled
Diffstat (limited to 'packages/0x.js/src/contract_wrappers/exchange_wrapper.ts')
-rw-r--r-- | packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts index ef3cc0b16..3e631b73e 100644 --- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts @@ -95,7 +95,7 @@ export class ExchangeWrapper extends ContractWrapper { * @param orderHash The hex encoded orderHash for which you would like to retrieve the * unavailable takerAmount. * @param methodOpts Optional arguments this method accepts. - * @return The amount of the order (in taker tokens) that has either been filled or canceled. + * @return The amount of the order (in taker tokens) that has either been filled or cancelled. */ public async getUnavailableTakerAmountAsync(orderHash: string, methodOpts?: MethodOpts): Promise<BigNumber> { @@ -133,7 +133,7 @@ export class ExchangeWrapper extends ContractWrapper { * @param methodOpts Optional arguments this method accepts. * @return The amount of the order (in taker tokens) that has been cancelled. */ - public async getCanceledTakerAmountAsync(orderHash: string, methodOpts?: MethodOpts): Promise<BigNumber> { + public async getCancelledTakerAmountAsync(orderHash: string, methodOpts?: MethodOpts): Promise<BigNumber> { assert.doesConformToSchema('orderHash', orderHash, schemas.orderHashSchema); const exchangeContract = await this._getExchangeContractAsync(); |