crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address feedback

Browse Source
This commit is contained in:
Leonid Logvinov
2017-06-02 18:34:43 +02:00
parent 0c98f4c754
commit 9620b18fec
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/utils/fill_scenarios.ts
View File

@@ -71,13 +71,14 @@ export class FillScenarios {
await this.zeroEx.token.setProxyAllowanceAsync(this.zrxTokenAddress, takerAddress, takerFee); await this.zeroEx.token.setProxyAllowanceAsync(this.zrxTokenAddress, takerAddress, takerFee);
} }
const transactionSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync(); const prevTransactionSenderAccount = await this.zeroEx.getTransactionSenderAccountIfExistsAsync();
this.zeroEx.setTransactionSenderAccount(makerAddress); this.zeroEx.setTransactionSenderAccount(makerAddress);
const signedOrder = await orderFactory.createSignedOrderAsync(this.zeroEx, const signedOrder = await orderFactory.createSignedOrderAsync(this.zeroEx,
makerAddress, takerAddress, makerFee, takerFee, makerAddress, takerAddress, makerFee, takerFee,
makerFillableAmount, makerTokenAddress, takerFillableAmount, takerTokenAddress, makerFillableAmount, makerTokenAddress, takerFillableAmount, takerTokenAddress,
feeRecepient, expirationUnixTimestampSec); feeRecepient, expirationUnixTimestampSec);
this.zeroEx.setTransactionSenderAccount(transactionSenderAccount as string); // We re-set the transactionSender to avoid introducing side-effects
this.zeroEx.setTransactionSenderAccount(prevTransactionSenderAccount as string);
return signedOrder; return signedOrder;
} }
} }

3
test/utils/token_utils.ts
View File

@@ -16,8 +16,9 @@ export class TokenUtils {
return zrxToken; return zrxToken;
} }
public getNonProtocolTokens(): Token[] { public getNonProtocolTokens(): Token[] {
return _.filter(this.tokens, token => { const nonProtocolTokens = _.filter(this.tokens, token => {
return token.symbol !== PROTOCOL_TOKEN_SYMBOL; return token.symbol !== PROTOCOL_TOKEN_SYMBOL;
}); });
return nonProtocolTokens;
} }
} }