diff options
author | Jacob Evans <jacob@dekz.net> | 2018-02-07 03:59:47 +0800 |
---|---|---|
committer | Jacob Evans <jacob@dekz.net> | 2018-02-07 05:17:14 +0800 |
commit | e17ace397cd5d0f4b24d3af868eef8ae55889456 (patch) | |
tree | 19293a228c6efbd34e8e4e56e85b3a48683d921c /packages/0x.js/src/order_watcher | |
parent | df8de7ff517ba1386671c658d402fa7436ff4f74 (diff) | |
download | dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar.gz dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar.bz2 dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar.lz dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar.xz dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.tar.zst dexon-sol-tools-e17ace397cd5d0f4b24d3af868eef8ae55889456.zip |
Move BlockParamLiteral to shared types package
Also BlockParam
Diffstat (limited to 'packages/0x.js/src/order_watcher')
-rw-r--r-- | packages/0x.js/src/order_watcher/event_watcher.ts | 4 | ||||
-rw-r--r-- | packages/0x.js/src/order_watcher/order_state_watcher.ts | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts index 5d05bfb60..e67b93251 100644 --- a/packages/0x.js/src/order_watcher/event_watcher.ts +++ b/packages/0x.js/src/order_watcher/event_watcher.ts @@ -3,7 +3,9 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import * as Web3 from 'web3'; -import { BlockParamLiteral, EventWatcherCallback, ZeroExError } from '../types'; +import { BlockParamLiteral } from '@0xproject/types'; + +import { EventWatcherCallback, ZeroExError } from '../types'; import { assert } from '../utils/assert'; const DEFAULT_EVENT_POLLING_INTERVAL_MS = 200; diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts index 1ad1a90b1..a9b3eba68 100644 --- a/packages/0x.js/src/order_watcher/order_state_watcher.ts +++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts @@ -1,5 +1,5 @@ import { schemas } from '@0xproject/json-schemas'; -import { LogWithDecodedArgs } from '@0xproject/types'; +import { BlockParamLiteral, LogWithDecodedArgs } from '@0xproject/types'; import { AbiDecoder, intervalUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; @@ -11,7 +11,6 @@ import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allow import { OrderFilledCancelledLazyStore } from '../stores/order_filled_cancelled_lazy_store'; import { ApprovalContractEventArgs, - BlockParamLiteral, ContractEventArgs, DepositContractEventArgs, EtherTokenEvents, |