Merge branch 'master' into fillOrderUpToAsync

2 files changed, 77 insertions, 52 deletions

diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 4a1dbaed6..3ae8515e2 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -52,7 +52,7 @@ describe('ExchangeWrapper', () => {
     afterEach(async () => {
         await blockchainLifecycle.revertAsync();
     });
-    describe('#fillOrKillOrderAsync', () => {
+    describe('fillOrKill order(s)', () => {
         let makerTokenAddress: string;
         let takerTokenAddress: string;
         let coinbase: string;
@@ -67,63 +67,88 @@ describe('ExchangeWrapper', () => {
             makerTokenAddress = makerToken.address;
             takerTokenAddress = takerToken.address;
         });
-        describe('failed fillOrKill', () => {
-            it('should throw if remaining fillAmount is less then the desired fillAmount', async () => {
+        describe('#batchFillOrKillAsync', () => {
+            it('successfuly batch fillOrKill', async () => {
                 const fillableAmount = new BigNumber(5);
+                const partialFillTakerAmount = new BigNumber(2);
                 const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
                     makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
                 );
-                const tooLargeFillAmount = new BigNumber(7);
-                const fillAmountDifference = tooLargeFillAmount.minus(fillableAmount);
-                await zeroEx.token.transferAsync(takerTokenAddress, coinbase, takerAddress, fillAmountDifference);
-                await zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress, tooLargeFillAmount);
-                await zeroEx.token.transferAsync(makerTokenAddress, coinbase, makerAddress, fillAmountDifference);
-                await zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress, tooLargeFillAmount);
-
-                return expect(zeroEx.exchange.fillOrKillOrderAsync(
-                    signedOrder, tooLargeFillAmount, takerAddress,
-                )).to.be.rejectedWith(ExchangeContractErrs.INSUFFICIENT_REMAINING_FILL_AMOUNT);
-            });
-        });
-        describe('successful fills', () => {
-            it('should fill a valid order', async () => {
-                const fillableAmount = new BigNumber(5);
-                const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                const anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync(
                     makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
                 );
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(fillableAmount);
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(0);
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(0);
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(fillableAmount);
-                await zeroEx.exchange.fillOrKillOrderAsync(signedOrder, fillTakerAmount, takerAddress);
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(fillableAmount.minus(fillTakerAmount));
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(fillTakerAmount);
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(fillTakerAmount);
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(fillableAmount.minus(fillTakerAmount));
+                const orderFillOrKillRequests = [
+                    {
+                        signedOrder,
+                        fillTakerAmount: partialFillTakerAmount,
+                    },
+                    {
+                        signedOrder: anotherSignedOrder,
+                        fillTakerAmount: partialFillTakerAmount,
+                    },
+                ];
+                await zeroEx.exchange.batchFillOrKillAsync(orderFillOrKillRequests, takerAddress);
             });
-            it('should partially fill a valid order', async () => {
-                const fillableAmount = new BigNumber(5);
-                const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
-                    makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
-                );
-                const partialFillAmount = new BigNumber(3);
-                await zeroEx.exchange.fillOrKillOrderAsync(signedOrder, partialFillAmount, takerAddress);
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(fillableAmount.minus(partialFillAmount));
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
-                    .to.be.bignumber.equal(partialFillAmount);
-                expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(partialFillAmount);
-                expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
-                    .to.be.bignumber.equal(fillableAmount.minus(partialFillAmount));
+        });
+        describe('#fillOrKillOrderAsync', () => {
+            describe('failed fillOrKill', () => {
+                it('should throw if remaining fillAmount is less then the desired fillAmount', async () => {
+                    const fillableAmount = new BigNumber(5);
+                    const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                        makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
+                    );
+                    const tooLargeFillAmount = new BigNumber(7);
+                    const fillAmountDifference = tooLargeFillAmount.minus(fillableAmount);
+                    await zeroEx.token.transferAsync(takerTokenAddress, coinbase, takerAddress, fillAmountDifference);
+                    await zeroEx.token.setProxyAllowanceAsync(takerTokenAddress, takerAddress, tooLargeFillAmount);
+                    await zeroEx.token.transferAsync(makerTokenAddress, coinbase, makerAddress, fillAmountDifference);
+                    await zeroEx.token.setProxyAllowanceAsync(makerTokenAddress, makerAddress, tooLargeFillAmount);
+
+                    return expect(zeroEx.exchange.fillOrKillOrderAsync(
+                        signedOrder, tooLargeFillAmount, takerAddress,
+                    )).to.be.rejectedWith(ExchangeContractErrs.INSUFFICIENT_REMAINING_FILL_AMOUNT);
+                });
+            });
+            describe('successful fills', () => {
+                it('should fill a valid order', async () => {
+                    const fillableAmount = new BigNumber(5);
+                    const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                        makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
+                    );
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(fillableAmount);
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(0);
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(0);
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(fillableAmount);
+                    await zeroEx.exchange.fillOrKillOrderAsync(signedOrder, fillTakerAmount, takerAddress);
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(fillableAmount.minus(fillTakerAmount));
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(fillTakerAmount);
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(fillTakerAmount);
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(fillableAmount.minus(fillTakerAmount));
+                });
+                it('should partially fill a valid order', async () => {
+                    const fillableAmount = new BigNumber(5);
+                    const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                        makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
+                    );
+                    const partialFillAmount = new BigNumber(3);
+                    await zeroEx.exchange.fillOrKillOrderAsync(signedOrder, partialFillAmount, takerAddress);
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(fillableAmount.minus(partialFillAmount));
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, makerAddress))
+                        .to.be.bignumber.equal(partialFillAmount);
+                    expect(await zeroEx.token.getBalanceAsync(makerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(partialFillAmount);
+                    expect(await zeroEx.token.getBalanceAsync(takerTokenAddress, takerAddress))
+                        .to.be.bignumber.equal(fillableAmount.minus(partialFillAmount));
+                });
             });
         });
     });
diff --git a/test/schema_test.ts b/test/schema_test.ts
index 1c4216496..d35ed4516 100644
--- a/test/schema_test.ts
+++ b/test/schema_test.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import * as chai from 'chai';
 import * as BigNumber from 'bignumber.js';
 import promisify = require('es6-promisify');
-import {numberSchema} from '../src/schemas/order_schemas';
+import {numberSchema} from '../src/schemas/basic_type_schemas';
 import {SchemaValidator} from '../src/utils/schema_validator';
 
 chai.config.includeStack = true;