diff options
author | Jacob Evans <dekz@dekz.net> | 2018-02-27 10:12:11 +0800 |
---|---|---|
committer | Jacob Evans <jacob@dekz.net> | 2018-02-27 10:47:09 +0800 |
commit | 6961169f89c4cd8480aca9c720cd8299aec9bbc0 (patch) | |
tree | 51b9a6a2f0dbaee50a9758a7983fe201d5898354 /packages/0x.js/test/expiration_watcher_test.ts | |
parent | 3d66feb89f8e4cfcb0b5251a96d02ef31f3ae34b (diff) | |
parent | 709fa9e02ec21cee9fc145b4a578742c8dd190aa (diff) | |
download | dexon-0x-contracts-6961169f89c4cd8480aca9c720cd8299aec9bbc0.tar.gz dexon-0x-contracts-6961169f89c4cd8480aca9c720cd8299aec9bbc0.tar.zst dexon-0x-contracts-6961169f89c4cd8480aca9c720cd8299aec9bbc0.zip |
Merge branch 'development' into feature/0x.js/lowercase-addresses
Diffstat (limited to 'packages/0x.js/test/expiration_watcher_test.ts')
-rw-r--r-- | packages/0x.js/test/expiration_watcher_test.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/0x.js/test/expiration_watcher_test.ts b/packages/0x.js/test/expiration_watcher_test.ts index b49dee8e5..7f79e3802 100644 --- a/packages/0x.js/test/expiration_watcher_test.ts +++ b/packages/0x.js/test/expiration_watcher_test.ts @@ -9,10 +9,10 @@ import * as Web3 from 'web3'; import { ZeroEx } from '../src/0x'; import { ExpirationWatcher } from '../src/order_watcher/expiration_watcher'; import { DoneCallback, Token } from '../src/types'; -import { constants } from '../src/utils/constants'; import { utils } from '../src/utils/utils'; import { chaiSetup } from './utils/chai_setup'; +import { constants } from './utils/constants'; import { FillScenarios } from './utils/fill_scenarios'; import { reportNoErrorCallbackErrors } from './utils/report_callback_errors'; import { TokenUtils } from './utils/token_utils'; |