diff options
| -rw-r--r-- | packages/0x.js/src/types.ts | 5 | ||||
| -rw-r--r-- | packages/0x.js/test/expiration_watcher_test.ts | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts index 39c60695e..c3aabfd86 100644 --- a/packages/0x.js/src/types.ts +++ b/packages/0x.js/src/types.ts @@ -391,18 +391,17 @@ export interface JSONRPCPayload { method: string; } -// tslint:disable:max-line-length /* * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50 * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Defaults: 200 - * expirationMarginMs: Amount of time before order expiry that you'd like to be notified of an orders expiration. Defaults: 0 + * expirationMarginMs: Amount of time before order expiry that you'd like to be notified + * of an orders expiration. Defaults: 0 */ export interface OrderStateWatcherConfig { orderExpirationCheckingIntervalMs?: number; eventPollingIntervalMs?: number; expirationMarginMs?: number; } -// tslint:enable:max-line-length /* * gasPrice: Gas price to use with every transaction diff --git a/packages/0x.js/test/expiration_watcher_test.ts b/packages/0x.js/test/expiration_watcher_test.ts index a384658e7..19c08a811 100644 --- a/packages/0x.js/test/expiration_watcher_test.ts +++ b/packages/0x.js/test/expiration_watcher_test.ts @@ -11,7 +11,7 @@ import {Web3Wrapper} from '../src/web3_wrapper'; import {TokenUtils} from './utils/token_utils'; import {ExpirationWatcher} from '../src/order_watcher/expiration_watcher'; import {Token, DoneCallback} from '../src/types'; -import {ZeroEx} from '../src'; +import {ZeroEx} from '../src/0x'; import {FillScenarios} from './utils/fill_scenarios'; import {reportCallbackErrors} from './utils/report_callback_errors'; @@ -65,8 +65,8 @@ describe('ExpirationWatcher', () => { }); it('correctly emits events when order expires', (done: DoneCallback) => { (async () => { - const orderLifetimeS = 60; - const expirationUnixTimestampSec = currentUnixTimestampSec.plus(orderLifetimeS); + const orderLifetimeSec = 60; + const expirationUnixTimestampSec = currentUnixTimestampSec.plus(orderLifetimeSec); const signedOrder = await fillScenarios.createFillableSignedOrderAsync( makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, expirationUnixTimestampSec, @@ -79,13 +79,13 @@ describe('ExpirationWatcher', () => { done(); }); expirationWatcher.subscribe(callbackAsync); - timer.tick(orderLifetimeS * 1000); + timer.tick(orderLifetimeSec * 1000); })().catch(done); }); it('doesn\'t emit events before order expires', (done: DoneCallback) => { (async () => { - const orderLifetimeS = 60; - const expirationUnixTimestampSec = currentUnixTimestampSec.plus(orderLifetimeS); + const orderLifetimeSec = 60; + const expirationUnixTimestampSec = currentUnixTimestampSec.plus(orderLifetimeSec); const signedOrder = await fillScenarios.createFillableSignedOrderAsync( makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, expirationUnixTimestampSec, @@ -96,7 +96,7 @@ describe('ExpirationWatcher', () => { done(new Error('Emitted expiration went before the order actually expired')); }); expirationWatcher.subscribe(callbackAsync); - const notEnoughTime = orderLifetimeS - 1; + const notEnoughTime = orderLifetimeSec - 1; timer.tick(notEnoughTime * 1000); done(); })().catch(done); |