diff options
author | Jacob Evans <dekz@dekz.net> | 2017-11-16 08:31:08 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 08:31:08 +0800 |
commit | 9ee04fb14c510c6633d288b212f4a8b9d1d640de (patch) | |
tree | 2f0be49e2c28bc6d3a4a0c791cff0ebc34c083c7 /packages/0x.js/src/types.ts | |
parent | e9a5ae21e0e738082924da24b62bb44a4df84286 (diff) | |
parent | 141f185c72959fb9470532fce5cfad7a06283723 (diff) | |
download | dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar.gz dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar.bz2 dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar.lz dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar.xz dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.tar.zst dexon-sol-tools-9ee04fb14c510c6633d288b212f4a8b9d1d640de.zip |
Merge branch 'development' into feature/track-zrx-movements
Diffstat (limited to 'packages/0x.js/src/types.ts')
-rw-r--r-- | packages/0x.js/src/types.ts | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index 71089f9a1..39e5fa9f2 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: { @@ -507,9 +502,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; |