diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-02 02:04:12 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-02 02:04:12 +0800 |
commit | 511fa537ad3d2a669d5d680efb26012ca1b9c062 (patch) | |
tree | 2aa369f30f294c2c6a94387413d439d5d7271333 /test/utils | |
parent | a1be87058536f5ab10c68c570c1b9994defe52b1 (diff) | |
download | dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar.gz dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar.bz2 dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar.lz dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar.xz dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.tar.zst dexon-0x-contracts-511fa537ad3d2a669d5d680efb26012ca1b9c062.zip |
Work
Diffstat (limited to 'test/utils')
-rw-r--r-- | test/utils/fill_scenarios.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/utils/fill_scenarios.ts b/test/utils/fill_scenarios.ts index 8447c8c15..ac233ad50 100644 --- a/test/utils/fill_scenarios.ts +++ b/test/utils/fill_scenarios.ts @@ -12,17 +12,17 @@ export class FillScenarios { this.userAddresses = userAddresses; this.tokens = tokens; } - public async createAFillableSignedOrderAsync(takerAddress: string, fillableAmount: BigNumber.BigNumber, + public async createAFillableSignedOrderAsync(makerTokenAddress: string, takerTokenAddress: string, + takerAddress: string, fillableAmount: BigNumber.BigNumber, expirationUnixTimestampSec?: BigNumber.BigNumber): Promise<SignedOrder> { const [makerAddress] = this.userAddresses; - const [makerToken, takerToken] = this.tokens; - await this.zeroEx.token.setProxyAllowanceAsync(makerToken.address, makerAddress, fillableAmount); - await this.zeroEx.token.transferAsync(takerToken.address, makerAddress, takerAddress, fillableAmount); - await this.zeroEx.token.setProxyAllowanceAsync(takerToken.address, takerAddress, fillableAmount); + 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 orderFactory.createSignedOrderAsync(this.zeroEx, makerAddress, - takerAddress, fillableAmount, makerToken.address, fillableAmount, takerToken.address, + takerAddress, fillableAmount, makerTokenAddress, fillableAmount, takerTokenAddress, expirationUnixTimestampSec); return signedOrder; } |