diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-03-10 01:54:29 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:16 +0800 |
commit | 97232145a40778fa489a59f9ef0685117eb9d07f (patch) | |
tree | 1f639526f50b144ac06ad8df52ca0ef22348ebfa | |
parent | 056ec6d2b381e3318fc9a894ae35a21209e9b87b (diff) | |
download | dexon-0x-contracts-97232145a40778fa489a59f9ef0685117eb9d07f.tar.gz dexon-0x-contracts-97232145a40778fa489a59f9ef0685117eb9d07f.tar.zst dexon-0x-contracts-97232145a40778fa489a59f9ef0685117eb9d07f.zip |
Fix package.json
-rw-r--r-- | packages/contracts/src/utils/constants.ts | 10 | ||||
-rw-r--r-- | packages/contracts/test/exchange/core.ts | 1 | ||||
-rw-r--r-- | yarn.lock | 39 |
3 files changed, 27 insertions, 23 deletions
diff --git a/packages/contracts/src/utils/constants.ts b/packages/contracts/src/utils/constants.ts index 09dd65653..6f1fea2fc 100644 --- a/packages/contracts/src/utils/constants.ts +++ b/packages/contracts/src/utils/constants.ts @@ -4,6 +4,7 @@ const DUMMY_TOKEN_NAME = ''; const DUMMY_TOKEN_SYMBOL = ''; const DUMMY_TOKEN_DECIMALS = 18; const DUMMY_TOKEN_TOTAL_SUPPLY = 0; +const TESTRPC_INITIAL_BALANCE_HEX = parseInt('100000000000000000000', 16); export const constants = { INVALID_OPCODE: 'invalid opcode', @@ -14,22 +15,21 @@ export const constants = { MAX_TOKEN_APPROVE_GAS: 60000, DUMMY_TOKEN_ARGS: [DUMMY_TOKEN_NAME, DUMMY_TOKEN_SYMBOL, DUMMY_TOKEN_DECIMALS, DUMMY_TOKEN_TOTAL_SUPPLY], TESTRPC_PORT: 8545, - TESTRPC_INITIAL_BALANCE_HEX: parseInt('100000000000000000000', 16), TESTRPC_ACCOUNTS: [ { - balance: this.TESTRPC_INITIAL_BALANCE_HEX, + balance: TESTRPC_INITIAL_BALANCE_HEX, secretKey: ethUtil.sha3('secret0'), }, { - balance: this.TESTRPC_INITIAL_BALANCE_HEX, + balance: TESTRPC_INITIAL_BALANCE_HEX, secretKey: ethUtil.sha3('secret1'), }, { - balance: this.TESTRPC_INITIAL_BALANCE_HEX, + balance: TESTRPC_INITIAL_BALANCE_HEX, secretKey: ethUtil.sha3('secret2'), }, { - balance: this.TESTRPC_INITIAL_BALANCE_HEX, + balance: TESTRPC_INITIAL_BALANCE_HEX, secretKey: ethUtil.sha3('secret3'), }, ], diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index b68db3edc..9b8f9e1d2 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -492,7 +492,6 @@ describe('Exchange', () => { makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18), takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18), }); - return expect(exWrapper.fillOrderAsync(signedOrder, takerAddress)).to.be.rejectedWith(constants.REVERT); }); @@ -1727,10 +1727,6 @@ buffer-from@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" -buffer-from@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" - buffer-indexof@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" @@ -2309,10 +2305,9 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" concat-stream@^1.4.10, concat-stream@^1.5.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + version "1.6.1" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" dependencies: - buffer-from "^1.0.0" inherits "^2.0.3" readable-stream "^2.2.2" typedarray "^0.0.6" @@ -3283,9 +3278,19 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: - version "1.3.40" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf" +electron-releases@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" + +electron-to-chromium@^1.2.7: + version "1.3.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" + dependencies: + electron-releases "^2.1.0" + +electron-to-chromium@^1.3.30: + version "1.3.36" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.36.tgz#0eabf71a9ebea9013fb1cc35a390e068624f27e8" elliptic@6.3.3: version "6.3.3" @@ -9344,14 +9349,14 @@ semver-sort@0.0.4: semver "^5.0.3" semver-regex "^1.0.0" -"semver@2 || 3 || 4 || 5", semver@5.5.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -semver@5.4.1, semver@~5.4.1: +"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@~5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" +semver@5.5.0, semver@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" + semver@^4.1.0: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" @@ -10194,8 +10199,8 @@ swarm-js@0.1.37: xhr-request-promise "^0.1.2" symbol-observable@^1.0.3, symbol-observable@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + version "1.1.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32" symbol@~0.3.1: version "0.3.1" |