diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-05-29 22:06:04 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-05-29 22:06:04 +0800 |
| commit | c513a5a5bd06d7af4e7a051a11bdd3eec4b54007 (patch) | |
| tree | cc32c9ee2a2665ee5dfb87b5a58bebd85cd42d7a /test/0x.js_test.ts | |
| parent | 61c8372ae004b53d85e91969bb6a93eae48951cf (diff) | |
| parent | abd0228ba8b71b35ff089fc647674caa08d7a24e (diff) | |
| download | dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar.gz dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar.bz2 dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar.lz dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar.xz dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.tar.zst dexon-sol-tools-c513a5a5bd06d7af4e7a051a11bdd3eec4b54007.zip | |
Merge branch 'master' into addSignOrderHashAndTests
# Conflicts:
# package.json
# src/globals.d.ts
# test/0x.js_test.ts
Diffstat (limited to 'test/0x.js_test.ts')
| -rw-r--r-- | test/0x.js_test.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts index 6de054437..871e8c727 100644 --- a/test/0x.js_test.ts +++ b/test/0x.js_test.ts @@ -5,7 +5,7 @@ import * as BigNumber from 'bignumber.js'; import ChaiBigNumber = require('chai-bignumber'); import * as Sinon from 'sinon'; import {ZeroEx} from '../src/0x.js'; -import {constants} from '../src/utils/constants'; +import {constants} from './utils/constants'; import {web3Factory} from './utils/web3_factory'; // Use BigNumber chai add-on |