aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-10-30 21:19:04 +0800
committerFabio Berger <me@fabioberger.com>2017-10-31 00:49:16 +0800
commit456f7e73048bd9176b2126f856fb9b5415c4089b (patch)
tree5a9199033c60ba25d4db07579ac29ca369595929
parented7917f9dfc83ea4dc150fbfc14145f038c9642d (diff)
downloaddexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar.gz
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar.bz2
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar.lz
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar.xz
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.tar.zst
dexon-sol-tools-456f7e73048bd9176b2126f856fb9b5415c4089b.zip
Introduce OrderState interface
-rw-r--r--src/types.ts14
-rw-r--r--test/order_watcher_test.ts6
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
+ });
});