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 /src | |
| 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 'src')
| -rw-r--r-- | src/globals.d.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/globals.d.ts b/src/globals.d.ts index 827164b4c..0f2fe0f2f 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -15,6 +15,7 @@ declare interface Schema { declare namespace Chai { interface Assertion { bignumber: Assertion; + // HACK: In order to comply with chai-as-promised we make eventually a `PromisedAssertion` not an `Assertion` eventually: PromisedAssertion; } } |