aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-07 17:44:07 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-07 17:44:07 +0800
commit498cc6cea12d9c7d2bb1af6b50f5609efb074734 (patch)
tree59d6243d13115f245e7183daa50e64dc38af047d /src/contract_wrappers
parent02d36d7c9c5ce0ba4c3d97d60e7d5eab2e924496 (diff)
downloaddexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar.gz
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar.bz2
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar.lz
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar.xz
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.tar.zst
dexon-sol-tools-498cc6cea12d9c7d2bb1af6b50f5609efb074734.zip
Use union type Order|SignedOrder
Diffstat (limited to 'src/contract_wrappers')
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 537eb08a4..fe03dbd16 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -175,7 +175,7 @@ export class ExchangeWrapper extends ContractWrapper {
/**
* Cancel a given fill amount of an order. Cancellations are cumulative.
*/
- public async cancelOrderAsync(order: Order, takerTokenCancelAmount: BigNumber.BigNumber): Promise<void> {
+ public async cancelOrderAsync(order: Order|SignedOrder, takerTokenCancelAmount: BigNumber.BigNumber): Promise<void> {
assert.doesConformToSchema('order',
SchemaValidator.convertToJSONSchemaCompatibleObject(order as object),
orderSchema);
@@ -234,7 +234,7 @@ export class ExchangeWrapper extends ContractWrapper {
/**
* Computes the orderHash for a given order and returns it as a hex encoded string.
*/
- public async getOrderHashAsync(order: Order): Promise<string> {
+ public async getOrderHashAsync(order: Order|SignedOrder): Promise<string> {
const [orderAddresses, orderValues] = ExchangeWrapper.getOrderAddressesAndValues(order);
const exchangeInstance = await this.getExchangeContractAsync();
const orderHash = utils.getOrderHashHex(order, exchangeInstance.address);