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

refactor up

Browse Source
This commit is contained in:
Jacob Evans
2017-11-15 16:37:02 -05:00
parent 9133e764a5
commit cf7727debc
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,10 +83,18 @@ export class OrderStateUtils {
const transferrableMakerTokenAmount = BigNumber.min([makerProxyAllowance, makerBalance]);
const transferrableFeeTokenAmount = BigNumber.min([makerFeeProxyAllowance, makerFeeBalance]);
const remainingFillableMakerTokenAmount = this.calculateFillableMakerTokenAmount(
transferrableMakerTokenAmount, transferrableFeeTokenAmount, remainingMakerTokenAmount,
remainingFeeTokenAmount, totalMakerTokenAmount, signedOrder.makerFee, signedOrder.makerTokenAddress,
zrxTokenAddress);
let remainingFillableMakerTokenAmount;
if (signedOrder.makerFee.isZero() ||
(transferrableFeeTokenAmount.greaterThanOrEqualTo(signedOrder.makerFee) &&
transferrableMakerTokenAmount.greaterThanOrEqualTo(remainingMakerTokenAmount) &&
signedOrder.makerTokenAddress !== zrxTokenAddress)) {
remainingFillableMakerTokenAmount = transferrableMakerTokenAmount;
} else {
remainingFillableMakerTokenAmount = this.calculatePartiallyFillableMakerTokenAmount(
transferrableMakerTokenAmount, transferrableFeeTokenAmount, remainingMakerTokenAmount,
remainingFeeTokenAmount, totalMakerTokenAmount, signedOrder.makerFee, signedOrder.makerTokenAddress,
zrxTokenAddress);
}
const remainingFillableTakerTokenAmount = remainingFillableMakerTokenAmount
.times(totalTakerTokenAmount)
@@ -103,18 +111,10 @@ export class OrderStateUtils {
};
return orderRelevantState;
}
private calculateFillableMakerTokenAmount(makerTransferrable: BigNumber, makerFeeTransferrable: BigNumber,
remainingMakerAmount: BigNumber, remainingMakerFee: BigNumber,
totalMakerAmount: BigNumber, makerFee: BigNumber,
makerTokenAddress: string, zrxTokenAddress: string): BigNumber {
if (makerFee.isZero()) {
return BigNumber.min(makerTransferrable, remainingMakerAmount);
}
if (makerFeeTransferrable.greaterThanOrEqualTo(makerFee) &&
makerTransferrable.greaterThanOrEqualTo(remainingMakerAmount) &&
makerTokenAddress !== zrxTokenAddress) {
return BigNumber.min(makerTransferrable, remainingMakerAmount);
}
private calculatePartiallyFillableMakerTokenAmount(makerTransferrable: BigNumber, makerFeeTransferrable: BigNumber,
remainingMakerAmount: BigNumber, remainingMakerFee: BigNumber,
totalMakerAmount: BigNumber, makerFee: BigNumber,
makerTokenAddress: string, zrxTokenAddress: string): BigNumber {
const orderToFeeRatio = totalMakerAmount.dividedToIntegerBy(makerFee);
let fillableTimesInMakerToken = makerTransferrable.dividedToIntegerBy(orderToFeeRatio);
const fillableTimesInFeeToken = BigNumber.min(makerFeeTransferrable, remainingMakerFee);

2
packages/0x.js/test/order_state_watcher_test.ts
View File

@@ -32,7 +32,7 @@ chaiSetup.configure();
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle();
describe('OrderStateWatcher', () => {
describe.only('OrderStateWatcher', () => {
let web3: Web3;
let zeroEx: ZeroEx;
let tokens: Token[];