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

Fix order validation tests

Browse Source
This commit is contained in:
Leonid Logvinov
2017-08-23 17:15:31 +02:00
parent 5dc32c32a6
commit dd9561797f
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/order_validation_test.ts
View File

@@ -151,6 +151,7 @@ describe('OrderValidation', () => {
describe('#validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync', () => { describe('#validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync', () => {
describe('should throw when not enough balance or allowance to fulfill the order', () => { describe('should throw when not enough balance or allowance to fulfill the order', () => {
const balanceToSubtractFromMaker = new BigNumber(3); const balanceToSubtractFromMaker = new BigNumber(3);
const balanceToSubtractFromTaker = new BigNumber(3);
const lackingAllowance = new BigNumber(3); const lackingAllowance = new BigNumber(3);
let signedOrder: SignedOrder; let signedOrder: SignedOrder;
beforeEach('create fillable signed order', async () => { beforeEach('create fillable signed order', async () => {
@@ -160,10 +161,10 @@ describe('OrderValidation', () => {
}); });
it('should throw when taker balance is less than fill amount', async () => { it('should throw when taker balance is less than fill amount', async () => {
await zeroEx.token.transferAsync( await zeroEx.token.transferAsync(
takerTokenAddress, takerAddress, coinbase, balanceToSubtractFromMaker, takerTokenAddress, takerAddress, coinbase, balanceToSubtractFromTaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerBalance);
}); });
it('should throw when taker allowance is less than fill amount', async () => { it('should throw when taker allowance is less than fill amount', async () => {
@@ -171,23 +172,23 @@ describe('OrderValidation', () => {
await zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress, await zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress,
newAllowanceWhichIsLessThanFillAmount); newAllowanceWhichIsLessThanFillAmount);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerAllowance);
}); });
it('should throw when maker balance is less than maker fill amount', async () => { it('should throw when maker balance is less than maker fill amount', async () => {
await zeroEx.token.transferAsync( await zeroEx.token.transferAsync(
makerTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker, makerTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance);
}); });
it('should throw when maker allowance is less than maker fill amount', async () => { it('should throw when maker allowance is less than maker fill amount', async () => {
const newAllowanceWhichIsLessThanFillAmount = fillTakerAmount.minus(lackingAllowance); const newAllowanceWhichIsLessThanFillAmount = fillTakerAmount.minus(lackingAllowance);
await zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress, await zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress,
newAllowanceWhichIsLessThanFillAmount); newAllowanceWhichIsLessThanFillAmount);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerAllowance);
}); });
}); });
@@ -206,16 +207,16 @@ describe('OrderValidation', () => {
await zeroEx.token.transferAsync( await zeroEx.token.transferAsync(
zrxTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker, zrxTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerFeeBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerFeeBalance);
}); });
it('should throw when maker doesn\'t have enough allowance to pay fees', async () => { it('should throw when maker doesn\'t have enough allowance to pay fees', async () => {
const newAllowanceWhichIsLessThanFees = makerFee.minus(1); const newAllowanceWhichIsLessThanFees = makerFee.minus(1);
await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, makerAddress, await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, makerAddress,
newAllowanceWhichIsLessThanFees); newAllowanceWhichIsLessThanFees);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerFeeAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerFeeAllowance);
}); });
it('should throw when taker doesn\'t have enough balance to pay fees', async () => { it('should throw when taker doesn\'t have enough balance to pay fees', async () => {
@@ -224,7 +225,7 @@ describe('OrderValidation', () => {
zrxTokenAddress, takerAddress, coinbase, balanceToSubtractFromTaker, zrxTokenAddress, takerAddress, coinbase, balanceToSubtractFromTaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerFeeBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerFeeBalance);
}); });
it('should throw when taker doesn\'t have enough allowance to pay fees', async () => { it('should throw when taker doesn\'t have enough allowance to pay fees', async () => {
@@ -232,7 +233,7 @@ describe('OrderValidation', () => {
await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, takerAddress, await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, takerAddress,
newAllowanceWhichIsLessThanFees); newAllowanceWhichIsLessThanFees);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerFeeAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerFeeAllowance);
}); });
}); });
@@ -252,8 +253,8 @@ describe('OrderValidation', () => {
await zeroEx.token.transferAsync( await zeroEx.token.transferAsync(
zrxTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker, zrxTokenAddress, makerAddress, coinbase, balanceToSubtractFromMaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerBalance);
}); });
it('should throw on insufficient allowance when makerToken is ZRX', async () => { it('should throw on insufficient allowance when makerToken is ZRX', async () => {
@@ -261,8 +262,8 @@ describe('OrderValidation', () => {
const newAllowanceWhichIsInsufficient = oldAllowance.minus(1); const newAllowanceWhichIsInsufficient = oldAllowance.minus(1);
await zeroEx.token.setProxyAllowanceAsync( await zeroEx.token.setProxyAllowanceAsync(
zrxTokenAddress, makerAddress, newAllowanceWhichIsInsufficient); zrxTokenAddress, makerAddress, newAllowanceWhichIsInsufficient);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderMakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientMakerAllowance);
}); });
}); });
@@ -283,7 +284,7 @@ describe('OrderValidation', () => {
zrxTokenAddress, takerAddress, coinbase, balanceToSubtractFromTaker, zrxTokenAddress, takerAddress, coinbase, balanceToSubtractFromTaker,
); );
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerBalance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerBalance);
}); });
it('should throw on insufficient allowance when takerToken is ZRX', async () => { it('should throw on insufficient allowance when takerToken is ZRX', async () => {
@@ -292,7 +293,7 @@ describe('OrderValidation', () => {
await zeroEx.token.setProxyAllowanceAsync( await zeroEx.token.setProxyAllowanceAsync(
zrxTokenAddress, takerAddress, newAllowanceWhichIsInsufficient); zrxTokenAddress, takerAddress, newAllowanceWhichIsInsufficient);
return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync( return expect((orderValidationUtils as any).validateFillOrderTakerBalancesAllowancesThrowIfInvalidAsync(
signedOrder, fillTakerAmount, takerAddress, signedOrder, fillTakerAmount, takerAddress, zrxTokenAddress,
)).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerAllowance); )).to.be.rejectedWith(ExchangeContractErrs.InsufficientTakerAllowance);
}); });
}); });