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

setting a failed test

Browse Source
This commit is contained in:
Jacob Evans
2017-11-21 14:00:21 +11:00
parent bbcee8dfa7
commit 43128234bb
1 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/0x.js/test/remaining_fillable_calculator_test.ts
View File

@@ -25,7 +25,7 @@ describe.only('RemainingFillableCalculator', () => {
const zero: BigNumber = new BigNumber(0); const zero: BigNumber = new BigNumber(0);
const zeroAddress = '0x0'; const zeroAddress = '0x0';
const signature: ECSignature = { v: 27, r: '', s: ''}; const signature: ECSignature = { v: 27, r: '', s: ''};
before(async () => { beforeEach(async () => {
[makerToken, takerToken, zrxToken] = ['0x1', '0x2', '0x3']; [makerToken, takerToken, zrxToken] = ['0x1', '0x2', '0x3'];
[makerAmount, takerAmount, makerFee] = [ZeroEx.toBaseUnitAmount(new BigNumber(50), 18), [makerAmount, takerAmount, makerFee] = [ZeroEx.toBaseUnitAmount(new BigNumber(50), 18),
ZeroEx.toBaseUnitAmount(new BigNumber(5), 18), ZeroEx.toBaseUnitAmount(new BigNumber(5), 18),
@@ -49,6 +49,23 @@ describe.only('RemainingFillableCalculator', () => {
salt: zero, salt: zero,
expirationUnixTimestampSec: zero }; expirationUnixTimestampSec: zero };
} }
describe('Maker token is NOT ZRX', () => {
it('calculates the correct amount when balance is less than remaining fillable', () => {
signedOrder = buildSignedOrder();
const partiallyFilledAmount = ZeroEx.toBaseUnitAmount(new BigNumber(2), 18);
remainingMakerTokenAmount = signedOrder.makerTokenAmount.minus(partiallyFilledAmount);
transferrableMakerTokenAmount = remainingMakerTokenAmount.minus(partiallyFilledAmount);
calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(transferrableMakerTokenAmount);
});
it('calculates the correct amount when unfilled and funds available', () => {
signedOrder = buildSignedOrder();
remainingMakerTokenAmount = signedOrder.makerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
});
it('calculates the correct amount when partially filled and funds available', () => { it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18); remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
@@ -56,8 +73,7 @@ describe.only('RemainingFillableCalculator', () => {
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount); transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount); expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
}); });
describe('Maker token is NOT ZRX', () => { it('calculates the amount to be 0 when all fee funds are transferred', () => {
it('calculates the amount to be 0 when all fee funds move', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
transferrableMakerFeeTokenAmount = zero; transferrableMakerFeeTokenAmount = zero;
remainingMakerTokenAmount = signedOrder.makerTokenAmount; remainingMakerTokenAmount = signedOrder.makerTokenAmount;
@@ -67,9 +83,28 @@ describe.only('RemainingFillableCalculator', () => {
}); });
}); });
describe('Maker Token is ZRX', () => { describe('Maker Token is ZRX', () => {
before(async () => { beforeEach(async () => {
makerToken = zrxToken; makerToken = zrxToken;
}); });
it('calculates the correct amount when balance is less than remaining fillable', () => {
signedOrder = buildSignedOrder();
const partiallyFilledAmount = ZeroEx.toBaseUnitAmount(new BigNumber(2), 18);
remainingMakerTokenAmount = signedOrder.makerTokenAmount.minus(partiallyFilledAmount);
transferrableMakerTokenAmount = remainingMakerTokenAmount.minus(partiallyFilledAmount);
transferrableMakerFeeTokenAmount = transferrableMakerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(transferrableMakerTokenAmount);
});
it('calculates the correct amount when unfilled and funds available', () => {
signedOrder = buildSignedOrder();
transferrableMakerTokenAmount = makerAmount.plus(makerFee);
transferrableMakerFeeTokenAmount = transferrableMakerTokenAmount;
remainingMakerTokenAmount = signedOrder.makerTokenAmount;
calculator = new RemainingFillableCalculator(signedOrder, zrxToken,
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
});
it('calculates the correct amount when partially filled and funds available', () => { it('calculates the correct amount when partially filled and funds available', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18); remainingMakerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
@@ -77,7 +112,7 @@ describe.only('RemainingFillableCalculator', () => {
transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount); transferrableMakerTokenAmount, transferrableMakerFeeTokenAmount, remainingMakerTokenAmount);
expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount); expect(calculator.computeRemainingMakerFillable()).to.be.bignumber.equal(remainingMakerTokenAmount);
}); });
it('calculates the amount to be 0 when all fee funds move', () => { it('calculates the amount to be 0 when all fee funds are transferred', () => {
signedOrder = buildSignedOrder(); signedOrder = buildSignedOrder();
transferrableMakerTokenAmount = zero; transferrableMakerTokenAmount = zero;
transferrableMakerFeeTokenAmount = zero; transferrableMakerFeeTokenAmount = zero;