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

Readability variable names

Browse Source
This commit is contained in:
Jacob Evans 2017-11-20 09:04:26 +11:00
parent cf7727debc
commit 3bb6d8871b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/0x.js/src/utils/order_state_utils.ts
View File

@ -85,7 +85,7 @@ export class OrderStateUtils {
let remainingFillableMakerTokenAmount; let remainingFillableMakerTokenAmount;
if (signedOrder.makerFee.isZero() || if (signedOrder.makerFee.isZero() ||
(transferrableFeeTokenAmount.greaterThanOrEqualTo(signedOrder.makerFee) && (transferrableFeeTokenAmount.greaterThanOrEqualTo(remainingFeeTokenAmount) &&
transferrableMakerTokenAmount.greaterThanOrEqualTo(remainingMakerTokenAmount) && transferrableMakerTokenAmount.greaterThanOrEqualTo(remainingMakerTokenAmount) &&
signedOrder.makerTokenAddress !== zrxTokenAddress)) { signedOrder.makerTokenAddress !== zrxTokenAddress)) {
remainingFillableMakerTokenAmount = transferrableMakerTokenAmount; remainingFillableMakerTokenAmount = transferrableMakerTokenAmount;
@ -111,17 +111,17 @@ export class OrderStateUtils {
}; };
return orderRelevantState; return orderRelevantState;
} }
private calculatePartiallyFillableMakerTokenAmount(makerTransferrable: BigNumber, makerFeeTransferrable: BigNumber, private calculatePartiallyFillableMakerTokenAmount(makerTransferrableAmount: BigNumber, makerFeeTransferrableAmount: BigNumber,
remainingMakerAmount: BigNumber, remainingMakerFee: BigNumber, remainingMakerAmount: BigNumber, remainingMakerFeeAmount: BigNumber,
totalMakerAmount: BigNumber, makerFee: BigNumber, totalMakerAmount: BigNumber, makerFeeAmount: BigNumber,
makerTokenAddress: string, zrxTokenAddress: string): BigNumber { makerTokenAddress: string, zrxTokenAddress: string): BigNumber {
const orderToFeeRatio = totalMakerAmount.dividedToIntegerBy(makerFee); const orderToFeeRatio = totalMakerAmount.dividedToIntegerBy(makerFeeAmount);
let fillableTimesInMakerToken = makerTransferrable.dividedToIntegerBy(orderToFeeRatio); const fillableTimesInFeeToken = BigNumber.min(makerFeeTransferrableAmount, remainingMakerFeeAmount);
const fillableTimesInFeeToken = BigNumber.min(makerFeeTransferrable, remainingMakerFee); let fillableTimesInMakerToken = makerTransferrableAmount.dividedToIntegerBy(orderToFeeRatio);
if (makerTokenAddress === zrxTokenAddress) { if (makerTokenAddress === zrxTokenAddress) {
fillableTimesInMakerToken = makerTransferrable.plus(makerFeeTransferrable) const totalFeeTokenPool = makerTransferrableAmount.plus(makerFeeTransferrableAmount);
.dividedToIntegerBy(orderToFeeRatio.plus( fillableTimesInMakerToken = totalFeeTokenPool.dividedToIntegerBy(
ZeroEx.toBaseUnitAmount(new BigNumber(1), 18))); orderToFeeRatio.plus(ZeroEx.toBaseUnitAmount(new BigNumber(1), 18)));
} }
return BigNumber.min(fillableTimesInMakerToken.times(orderToFeeRatio), return BigNumber.min(fillableTimesInMakerToken.times(orderToFeeRatio),