Merge branch 'master' into json-schema

3 files changed, 31 insertions, 12 deletions

diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index be6234ff9..522be4588 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -28,6 +28,8 @@ import {utils} from '../utils/utils';
 import {ContractWrapper} from './contract_wrapper';
 import * as ExchangeArtifacts from '../artifacts/Exchange.json';
 import {ecSignatureSchema} from '../schemas/ec_signature_schema';
+import {orderFillRequestsSchema} from '../schemas/order_fill_requests_schema';
+import {orderCancellationRequestsSchema} from '../schemas/order_cancel_schema';
 import {orderFillOrKillRequestsSchema} from '../schemas/order_fill_or_kill_requests_schema';
 import {signedOrderSchema, orderSchema} from '../schemas/order_schemas';
 import {constants} from '../utils/constants';
@@ -167,14 +169,11 @@ export class ExchangeWrapper extends ContractWrapper {
                                      shouldCheckTransfer: boolean, takerAddress: string): Promise<void> {
         assert.isBoolean('shouldCheckTransfer', shouldCheckTransfer);
         await assert.isSenderAddressAsync('takerAddress', takerAddress, this.web3Wrapper);
-        _.forEach(orderFillRequests,
-            async (orderFillRequest: OrderFillRequest, i: number) => {
-            assert.doesConformToSchema(`orderFillRequests[${i}].signedOrder`, orderFillRequest.signedOrder,
-                                       signedOrderSchema);
-            assert.isBigNumber(`orderFillRequests[${i}].takerTokenFillAmount`, orderFillRequest.takerTokenFillAmount);
+        assert.doesConformToSchema('orderFillRequests', orderFillRequests, orderFillRequestsSchema);
+        for (const orderFillrequest of orderFillRequests) {
             await this.validateFillOrderAndThrowIfInvalidAsync(
                 orderFillRequest.signedOrder, orderFillRequest.takerTokenFillAmount, takerAddress);
-        });
+        }
         if (_.isEmpty(orderFillRequests)) {
             return; // no-op
         }
@@ -362,12 +361,8 @@ export class ExchangeWrapper extends ContractWrapper {
         assert.assert(_.uniq(makers).length === 1, ExchangeContractErrs.MULTIPLE_MAKERS_IN_SINGLE_CANCEL_BATCH);
         const maker = makers[0];
         await assert.isSenderAddressAsync('maker', maker, this.web3Wrapper);
-        _.forEach(orderCancellationRequests,
-            async (cancellationRequest: OrderCancellationRequest, i: number) => {
-            assert.doesConformToSchema(`orderCancellationRequests[${i}].order`, cancellationRequest.order, orderSchema);
-            assert.isBigNumber(`orderCancellationRequests[${i}].takerTokenCancelAmount`,
-                cancellationRequest.takerTokenCancelAmount,
-            );
+        assert.doesConformToSchema('orderCancellationRequests', orderCancellationRequests, orderCancellationRequestsSchema);
+        for (const cancellationRequest of orderCancellationRequests) {
             await this.validateCancelOrderAndThrowIfInvalidAsync(
                 cancellationRequest.order, cancellationRequest.takerTokenCancelAmount,
             );
diff --git a/src/schemas/order_cancel_schema.ts b/src/schemas/order_cancel_schema.ts
new file mode 100644
index 000000000..5cc8f745c
--- /dev/null
+++ b/src/schemas/order_cancel_schema.ts
@@ -0,0 +1,12 @@
+export const orderCancellationRequestsSchema = {
+    id: '/OrderCancellationRequests',
+    type: 'array',
+    items: {
+        properties: {
+            order: {$ref: '/orderSchema'},
+            takerTokenCancelAmount: {type: '/numberSchema'},
+        },
+        required: ['order', 'takerTokenCancelAmount'],
+        type: 'object',
+    },
+};
diff --git a/src/schemas/order_fill_requests_schema.ts b/src/schemas/order_fill_requests_schema.ts
new file mode 100644
index 000000000..44f4e33e2
--- /dev/null
+++ b/src/schemas/order_fill_requests_schema.ts
@@ -0,0 +1,12 @@
+export const orderFillRequestsSchema = {
+    id: '/OrderFillRequests',
+    type: 'array',
+    items: {
+        properties: {
+            signedOrder: {$ref: '/signedOrderSchema'},
+            takerTokenFillAmount: {type: '/numberSchema'},
+        },
+        required: ['signedOrder', 'takerTokenFillAmount'],
+        type: 'object',
+    },
+};