aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-07-20 01:14:31 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-07-26 04:25:56 +0800
commit31d068b83ff8d8e9117e410693c3afbc6f8a82ab (patch)
treeb5d8a8dd9393b2d6fca268cdf3e05a08d08fd596
parent73e8f890b520ceaf16b5ad38f926b67dd3ea148b (diff)
downloaddexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar.gz
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar.bz2
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar.lz
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar.xz
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.tar.zst
dexon-sol-tools-31d068b83ff8d8e9117e410693c3afbc6f8a82ab.zip
Remove and from names
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts2
-rw-r--r--src/utils/order_validation_utils.ts10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 65bb37760..88dca82b2 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -662,7 +662,7 @@ export class ExchangeWrapper extends ContractWrapper {
throw new Error(ExchangeContractErrs.OrderFillExpired);
}
const zrxTokenAddress = await this._getZRXTokenAddressAsync(signedOrder.exchangeContractAddress);
- await OrderValidationUtils.validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync(
+ await OrderValidationUtils.validateFillOrderBalancesAllowancesThrowIfInvalidAsync(
this._tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress,
);
diff --git a/src/utils/order_validation_utils.ts b/src/utils/order_validation_utils.ts
index 4452a7aef..f85b8dd23 100644
--- a/src/utils/order_validation_utils.ts
+++ b/src/utils/order_validation_utils.ts
@@ -2,17 +2,17 @@ import {ExchangeContractErrs, SignedOrder} from '../types';
import {TokenWrapper} from '../contract_wrappers/token_wrapper';
export class OrderValidationUtils {
- public static async validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync(
+ public static async validateFillOrderBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
senderAddress: string, zrxTokenAddress: string): Promise<void> {
- await OrderValidationUtils.validateFillOrderMakerBalancesAndAllowancesAndThrowIfInvalidAsync(
+ await OrderValidationUtils.validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper, signedOrder, fillTakerAmount, zrxTokenAddress,
);
- await OrderValidationUtils.validateFillOrderTakerBalancesAndAllowancesAndThrowIfInvalidAsync(
+ await OrderValidationUtils.validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper, signedOrder, fillTakerAmount, senderAddress, zrxTokenAddress,
);
}
- private static async validateFillOrderMakerBalancesAndAllowancesAndThrowIfInvalidAsync(
+ private static async validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
zrxTokenAddress: string,
): Promise<void> {
@@ -51,7 +51,7 @@ export class OrderValidationUtils {
}
}
}
- private static async validateFillOrderTakerBalancesAndAllowancesAndThrowIfInvalidAsync(
+ private static async validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
tokenWrapper: TokenWrapper, signedOrder: SignedOrder, fillTakerAmount: BigNumber.BigNumber,
senderAddress: string, zrxTokenAddress: string,
): Promise<void> {