diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-10-30 21:19:04 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-10 03:11:45 +0800 |
commit | 0b84c469d346c85201ff569b683a38b5c972ad73 (patch) | |
tree | ce843628f849cf86b249220dedb5c53194f3376d | |
parent | ff5d18d327ccde9e47c46dfc5a191778d7d34c83 (diff) | |
download | dexon-sol-tools-0b84c469d346c85201ff569b683a38b5c972ad73.tar.gz dexon-sol-tools-0b84c469d346c85201ff569b683a38b5c972ad73.tar.zst dexon-sol-tools-0b84c469d346c85201ff569b683a38b5c972ad73.zip |
Introduce OrderState interface
-rw-r--r-- | src/types.ts | 14 | ||||
-rw-r--r-- | test/order_watcher_test.ts | 6 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/types.ts b/src/types.ts index 52b22516b..89ee4141f 100644 --- a/src/types.ts +++ b/src/types.ts @@ -480,17 +480,21 @@ export enum TransferType { Fee = 'fee', } -export interface OrderStateValid { - isValid: true; - orderHash: string; +export interface OrderState { makerBalance: BigNumber; - makerAllowance: BigNumber; + makerProxyAllowance: BigNumber; makerFeeBalance: BigNumber; - makerFeeAllowance: BigNumber; + makerFeeProxyAllowance: BigNumber; filledMakerTokenAmount: BigNumber; cancelledMakerTokenAmount: BigNumber; } +export interface OrderStateValid { + isValid: true; + orderHash: string; + orderState: OrderState; +} + export interface OrderStateInvalid { isValid: false; orderHash: string; diff --git a/test/order_watcher_test.ts b/test/order_watcher_test.ts index f273a1d84..e62b1aab2 100644 --- a/test/order_watcher_test.ts +++ b/test/order_watcher_test.ts @@ -36,7 +36,7 @@ describe('EventWatcher', () => { stubs = []; orderStateWatcher.unsubscribe(); }); - it.only('', (done: DoneCallback) => { - orderStateWatcher.subscribe(console.log); - }).timeout(1000000000000); + it.skip('TODO', () => { + // TODO + }); }); |