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

Remove and from names

Browse Source
This commit is contained in:
Leonid Logvinov
2017-07-19 10:14:31 -07:00
parent 73e8f890b5
commit 31d068b83f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/contract_wrappers/exchange_wrapper.ts
View File

@@ -662,7 +662,7 @@ export class ExchangeWrapper extends ContractWrapper {
throw new Error(ExchangeContractErrs.OrderFillExpired); throw new Error(ExchangeContractErrs.OrderFillExpired);
} }
const zrxTokenAddress = await this._getZRXTokenAddressAsync(signedOrder.exchangeContractAddress); const zrxTokenAddress = await this._getZRXTokenAddressAsync(signedOrder.exchangeContractAddress);
await OrderValidationUtils.validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync( await OrderValidationUtils.validateFillOrderBalancesAllowancesThrowIfInvalidAsync(
this._tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress, this._tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress,
); );

10
src/utils/order_validation_utils.ts
View File

@@ -2,17 +2,17 @@ import {ExchangeContractErrs, SignedOrder} from '../types';
import {TokenWrapper} from '../contract_wrappers/token_wrapper'; import {TokenWrapper} from '../contract_wrappers/token_wrapper';
export class OrderValidationUtils { export class OrderValidationUtils {
public static async validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync( public static async validateFillOrderBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber, tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
senderAddress: string, zrxTokenAddress: string): Promise<void> { senderAddress: string, zrxTokenAddress: string): Promise<void> {
await OrderValidationUtils.validateFillOrderMakerBalancesAndAllowancesAndThrowIfInvalidAsync( await OrderValidationUtils.validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper, signedOrder, fillTakerAmount, zrxTokenAddress, tokenWrapper, signedOrder, fillTakerAmount, zrxTokenAddress,
); );
await OrderValidationUtils.validateFillOrderTakerBalancesAndAllowancesAndThrowIfInvalidAsync( await OrderValidationUtils.validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress, tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress,
); );
} }
private static async validateFillOrderMakerBalancesAndAllowancesAndThrowIfInvalidAsync( private static async validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber, tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
zrxTokenAddress: string, zrxTokenAddress: string,
): Promise<void> { ): Promise<void> {
@@ -51,7 +51,7 @@ export class OrderValidationUtils {
} }
} }
} }
private static async validateFillOrderTakerBalancesAndAllowancesAndThrowIfInvalidAsync( private static async validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber, tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
senderAddress: string, zrxTokenAddress: string, senderAddress: string, zrxTokenAddress: string,
): Promise<void> { ): Promise<void> {