From 0c91b66f45f0a6ec08cdfe6f2430f00c1291feb9 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 13 Nov 2017 17:58:41 -0500
Subject: Add remainingFillableMakerAmount to types

---
 packages/0x.js/src/types.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/0x.js/src/types.ts')

diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 11683378f..da1971387 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -490,6 +490,7 @@ export interface OrderRelevantState {
     filledTakerTokenAmount: BigNumber;
     canceledTakerTokenAmount: BigNumber;
     remainingFillableMakerTokenAmount: BigNumber;
+    remainingFillableTakerTokenAmount: BigNumber;
 }
 
 export interface OrderStateValid {
-- 
cgit v1.2.3


From a12069f03fb1c1c93884c2e168917d229f7864e9 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Tue, 14 Nov 2017 10:56:57 -0500
Subject: Callback for subscribe no longer supports an Async Callback

---
 packages/0x.js/src/types.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'packages/0x.js/src/types.ts')

diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 11b5d8569..04dfe3b0d 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -42,13 +42,8 @@ export type OrderValues = [BigNumber, BigNumber, BigNumber,
 export type LogEvent = Web3.LogEntryEvent;
 export type DecodedLogEvent<ArgsType> = Web3.DecodedLogEntryEvent<ArgsType>;
 
-export type EventCallbackAsync<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => Promise<void>;
-export type EventCallbackSync<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void;
-export type EventCallback<ArgsType> = EventCallbackSync<ArgsType>|EventCallbackAsync<ArgsType>;
-
-export type EventWatcherCallbackSync = (log: LogEvent) => void;
-export type EventWatcherCallbackAsync = (log: LogEvent) => Promise<void>;
-export type EventWatcherCallback = EventWatcherCallbackSync|EventWatcherCallbackAsync;
+export type EventCallback<ArgsType> = (err: null|Error, log?: DecodedLogEvent<ArgsType>) => void;
+export type EventWatcherCallback = (log: LogEvent) => void;
 
 export interface ExchangeContract extends Web3.ContractInstance {
     isValidSignature: {
-- 
cgit v1.2.3


From 752603284de28f8d966fe61a52d0ffe5dd8afd6a Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Tue, 14 Nov 2017 11:21:00 -0500
Subject: Remove Async subscribe callbacks from OrderWatcher

---
 packages/0x.js/src/types.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages/0x.js/src/types.ts')

diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 04dfe3b0d..91e3c0f20 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -501,9 +501,7 @@ export interface OrderStateInvalid {
 
 export type OrderState = OrderStateValid|OrderStateInvalid;
 
-export type OnOrderStateChangeCallbackSync = (orderState: OrderState) => void;
-export type OnOrderStateChangeCallbackAsync = (orderState: OrderState) => Promise<void>;
-export type OnOrderStateChangeCallback = OnOrderStateChangeCallbackAsync|OnOrderStateChangeCallbackSync;
+export type OnOrderStateChangeCallback = (orderState: OrderState) => void;
 
 export interface TransactionReceipt {
     blockHash: string;
-- 
cgit v1.2.3