diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:05:25 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:05:25 +0800 |
| commit | 45f9ffd86c4878cf38c268933b0d30ff50f8a9c8 (patch) | |
| tree | c9ca7ff492c5b7527509f1fe93d120d75ed6d1de | |
| parent | 40208e3b2d6bdf465adf0d5a068b234991999646 (diff) | |
| parent | 5925f81fe185a90efaa82dd90bd8d65d74326f11 (diff) | |
| download | dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.gz dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.tar.zst dexon-0x-contracts-45f9ffd86c4878cf38c268933b0d30ff50f8a9c8.zip | |
Merge branch 'master' into addEventSubscriptions
# Conflicts:
# src/types.ts
# test/exchange_wrapper_test.ts
# test/utils/fill_scenarios.ts
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test/exchange_wrapper_test.ts | 4 | ||||
| -rw-r--r-- | test/utils/fill_scenarios.ts | 10 | ||||
| -rw-r--r-- | yarn.lock | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/package.json b/package.json index 8b472f2a9..249d8906b 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "chai": "^3.5.0", "chai-as-promised": "^6.0.0", "chai-as-promised-typescript-typings": "0.0.2", - "chai-bignumber": "^2.0.0", + "chai-bignumber": "git+ssh://git@github.com:0xProject/chai-bignumber.git", "chai-typescript-typings": "^0.0.0", "copyfiles": "^1.2.0", "dirty-chai": "^1.2.2", diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index ab6f2df67..a44d2728a 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -32,11 +32,11 @@ const NON_EXISTENT_ORDER_HASH = '0x79370342234e7acd6bbeac335bd3bb1d368383294b64b describe('ExchangeWrapper', () => { let web3: Web3; let zeroEx: ZeroEx; - let userAddresses: string[]; let tokenUtils: TokenUtils; let tokens: Token[]; - let fillScenarios: FillScenarios; + let userAddresses: string[]; let zrxTokenAddress: string; + let fillScenarios: FillScenarios; before(async () => { web3 = web3Factory.create(); zeroEx = new ZeroEx(web3); diff --git a/test/utils/fill_scenarios.ts b/test/utils/fill_scenarios.ts index ea5eb77eb..d186593b9 100644 --- a/test/utils/fill_scenarios.ts +++ b/test/utils/fill_scenarios.ts @@ -56,14 +56,10 @@ export class FillScenarios { partialFillAmount: BigNumber.BigNumber) { const prevSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync(); const [makerAddress] = this.userAddresses; - await this.zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress, fillableAmount); - await this.zeroEx.token.transferAsync(takerTokenAddress, makerAddress, takerAddress, fillableAmount); - await this.zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress, fillableAmount); - const signedOrder = await this.createAsymmetricFillableSignedOrderAsync( - makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, - fillableAmount, fillableAmount, - ); + makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, + fillableAmount, fillableAmount, + ); this.zeroEx.setTransactionSenderAccount(takerAddress); const shouldCheckTransfer = false; @@ -914,6 +914,10 @@ chai-bignumber@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-2.0.0.tgz#0cbf9b81790801c3f24fb77f59fa1e17a9c6e3f2" +"chai-bignumber@git+ssh://git@github.com:0xProject/chai-bignumber.git": + version "2.0.0" + resolved "git+ssh://git@github.com/0xProject/chai-bignumber.git#9ef233f3e2ca3ab250b66149390c833c117c27e7" + chai-typescript-typings@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.0.tgz#52e076d72cf29129c94ab1dba6e33ce3828a0724" |