Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/connect/sra-api-v2

2 files changed, 10 insertions, 12 deletions

diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 5ce1805e7..59d80fd08 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -55,7 +55,7 @@
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
-        "copyfiles": "^1.2.0",
+        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "json-loader": "^0.5.4",
         "make-promises-safe": "^1.1.0",
diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts
index 00962bed0..38bfde7ef 100644
--- a/packages/order-watcher/test/order_watcher_test.ts
+++ b/packages/order-watcher/test/order_watcher_test.ts
@@ -501,25 +501,27 @@ describe('OrderWatcher', () => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
-                    expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderFillRoundingError);
+                    expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderCancelled);
                 });
                 orderWatcher.subscribe(callback);
                 await contractWrappers.exchange.cancelOrderAsync(signedOrder);
             })().catch(done);
         });
-        it('should emit orderStateInvalid when within rounding error range', (done: DoneCallback) => {
+        it('should emit orderStateInvalid when within rounding error range after a partial fill', (done: DoneCallback) => {
             (async () => {
-                const remainingFillableAmountInBaseUnits = new BigNumber(100);
-                signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                const fillAmountInBaseUnits = new BigNumber(2);
+                const makerAssetAmount = new BigNumber(1001);
+                const takerAssetAmount = new BigNumber(3);
+                signedOrder = await fillScenarios.createAsymmetricFillableSignedOrderAsync(
                     makerAssetData,
                     takerAssetData,
                     makerAddress,
                     takerAddress,
-                    fillableAmount,
+                    makerAssetAmount,
+                    takerAssetAmount,
                 );
                 const orderHash = orderHashUtils.getOrderHashHex(signedOrder);
                 await orderWatcher.addOrderAsync(signedOrder);
-
                 const callback = callbackErrorReporter.reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
@@ -527,11 +529,7 @@ describe('OrderWatcher', () => {
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderFillRoundingError);
                 });
                 orderWatcher.subscribe(callback);
-                await contractWrappers.exchange.fillOrderAsync(
-                    signedOrder,
-                    fillableAmount.minus(remainingFillableAmountInBaseUnits),
-                    takerAddress,
-                );
+                await contractWrappers.exchange.fillOrderAsync(signedOrder, fillAmountInBaseUnits, takerAddress);
             })().catch(done);
         });
         describe('erc721', () => {