diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-06-06 21:14:53 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 21:14:53 +0800 |
commit | 692a0fd965f7c0cfc0eef79112d2abffdf9e90db (patch) | |
tree | a3a97eb6522bc887966da6575e4b2ac73560fdcf /test/utils | |
parent | 2eb99f46f53984c1a54315f87059ef18b9d06349 (diff) | |
parent | f54b513935dbba0dd1922566ed2fd4b4acbf6459 (diff) | |
download | dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar.gz dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar.bz2 dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar.lz dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar.xz dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.tar.zst dexon-0x-contracts-692a0fd965f7c0cfc0eef79112d2abffdf9e90db.zip |
Merge pull request #39 from 0xProject/senderAccount
Make methods accept senderAccount
Diffstat (limited to 'test/utils')
-rw-r--r-- | test/utils/fill_scenarios.ts | 12 | ||||
-rw-r--r-- | test/utils/order_factory.ts | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/test/utils/fill_scenarios.ts b/test/utils/fill_scenarios.ts index d186593b9..d8d6cd0b9 100644 --- a/test/utils/fill_scenarios.ts +++ b/test/utils/fill_scenarios.ts @@ -54,19 +54,13 @@ export class FillScenarios { public async createPartiallyFilledSignedOrderAsync(makerTokenAddress: string, takerTokenAddress: string, takerAddress: string, fillableAmount: BigNumber.BigNumber, partialFillAmount: BigNumber.BigNumber) { - const prevSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync(); const [makerAddress] = this.userAddresses; const signedOrder = await this.createAsymmetricFillableSignedOrderAsync( makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, fillableAmount, ); - - this.zeroEx.setTransactionSenderAccount(takerAddress); const shouldCheckTransfer = false; - await this.zeroEx.exchange.fillOrderAsync(signedOrder, partialFillAmount, shouldCheckTransfer); - - // Re-set sender account so as to avoid introducing side-effects - this.zeroEx.setTransactionSenderAccount(prevSenderAccount as string); + await this.zeroEx.exchange.fillOrderAsync(signedOrder, partialFillAmount, shouldCheckTransfer, takerAddress); return signedOrder; } private async createAsymmetricFillableSignedOrderWithFeesAsync( @@ -89,14 +83,10 @@ export class FillScenarios { await this.zeroEx.token.setProxyAllowanceAsync(this.zrxTokenAddress, takerAddress, takerFee); } - const prevTransactionSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync(); - this.zeroEx.setTransactionSenderAccount(makerAddress); const signedOrder = await orderFactory.createSignedOrderAsync(this.zeroEx, makerAddress, takerAddress, makerFee, takerFee, makerFillableAmount, makerTokenAddress, takerFillableAmount, takerTokenAddress, feeRecepient, expirationUnixTimestampSec); - // We re-set the transactionSender to avoid introducing side-effects - this.zeroEx.setTransactionSenderAccount(prevTransactionSenderAccount as string); return signedOrder; } } diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts index 373dbddc6..6f5fa7286 100644 --- a/test/utils/order_factory.ts +++ b/test/utils/order_factory.ts @@ -36,7 +36,7 @@ export const orderFactory = { expirationUnixTimestampSec, }; const orderHash = await zeroEx.getOrderHashHexAsync(order); - const ecSignature = await zeroEx.signOrderHashAsync(orderHash); + const ecSignature = await zeroEx.signOrderHashAsync(orderHash, maker); const signedOrder: SignedOrder = _.assign(order, {ecSignature}); return signedOrder; }, |