Fix tests

7 files changed, 28 insertions, 38 deletions

diff --git a/packages/contract-wrappers/src/artifacts/Exchange.json b/packages/contract-wrappers/src/artifacts/Exchange.json
index 7d0bac63a..350f521df 100644
--- a/packages/contract-wrappers/src/artifacts/Exchange.json
+++ b/packages/contract-wrappers/src/artifacts/Exchange.json
@@ -1027,28 +1027,6 @@
                 "type": "function"
             },
             {
-                "constant": false,
-                "inputs": [
-                    {
-                        "name": "assetProxyId",
-                        "type": "bytes4"
-                    },
-                    {
-                        "name": "newAssetProxy",
-                        "type": "address"
-                    },
-                    {
-                        "name": "oldAssetProxy",
-                        "type": "address"
-                    }
-                ],
-                "name": "registerAssetProxy",
-                "outputs": [],
-                "payable": false,
-                "stateMutability": "nonpayable",
-                "type": "function"
-            },
-            {
                 "constant": true,
                 "inputs": [],
                 "name": "owner",
@@ -1306,6 +1284,20 @@
                 "type": "function"
             },
             {
+                "constant": false,
+                "inputs": [
+                    {
+                        "name": "assetProxy",
+                        "type": "address"
+                    }
+                ],
+                "name": "registerAssetProxy",
+                "outputs": [],
+                "payable": false,
+                "stateMutability": "nonpayable",
+                "type": "function"
+            },
+            {
                 "constant": true,
                 "inputs": [
                     {
@@ -1899,16 +1891,11 @@
                     },
                     {
                         "indexed": false,
-                        "name": "newAssetProxy",
-                        "type": "address"
-                    },
-                    {
-                        "indexed": false,
-                        "name": "oldAssetProxy",
+                        "name": "assetProxy",
                         "type": "address"
                     }
                 ],
-                "name": "AssetProxySet",
+                "name": "AssetProxyRegistered",
                 "type": "event"
             }
         ]
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 194a933f0..b3c4b2c60 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -61,7 +61,7 @@ export {
 
 export {
     ExchangeCancelUpToEventArgs,
-    ExchangeAssetProxySetEventArgs,
+    ExchangeAssetProxyRegisteredEventArgs,
     ExchangeFillEventArgs,
     ExchangeCancelEventArgs,
     ExchangeEventArgs,
diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts
index e1e0e02f6..b2c716008 100644
--- a/packages/contract-wrappers/test/exchange_wrapper_test.ts
+++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts
@@ -486,9 +486,15 @@ describe('ExchangeWrapper', () => {
         it('should only get the logs with the correct indexed fields', async () => {
             txHash = await contractWrappers.exchange.fillOrderAsync(signedOrder, takerTokenFillAmount, takerAddress);
             await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS);
-
+            const signedOrderWithAnotherMakerAddress = await fillScenarios.createFillableSignedOrderAsync(
+                makerAssetData,
+                takerAssetData,
+                anotherMakerAddress,
+                takerAddress,
+                fillableAmount,
+            );
             txHash = await contractWrappers.exchange.fillOrderAsync(
-                anotherSignedOrder,
+                signedOrderWithAnotherMakerAddress,
                 takerTokenFillAmount,
                 takerAddress,
             );
diff --git a/packages/contract-wrappers/test/utils/web3_wrapper.ts b/packages/contract-wrappers/test/utils/web3_wrapper.ts
index 641444539..02c8c5918 100644
--- a/packages/contract-wrappers/test/utils/web3_wrapper.ts
+++ b/packages/contract-wrappers/test/utils/web3_wrapper.ts
@@ -4,7 +4,7 @@ import { Provider } from 'ethereum-types';
 
 const txDefaults = {
     from: devConstants.TESTRPC_FIRST_ADDRESS,
-    gasLimit: devConstants.GAS_LIMIT,
+    gas: devConstants.GAS_LIMIT,
 };
 const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true });
 const web3Wrapper = new Web3Wrapper(provider);
diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 544ca0305..d0f74a2bc 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -1,4 +1,4 @@
-// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name
 // tslint:disable:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
 import { ContractArtifact } from '@0xproject/sol-compiler';
diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts
index c541af8e6..cac3a0923 100644
--- a/packages/order-watcher/src/order_watcher/order_watcher.ts
+++ b/packages/order-watcher/src/order_watcher/order_watcher.ts
@@ -1,10 +1,7 @@
 import {
     BalanceAndProxyAllowanceLazyStore,
     ContractWrappers,
-    LogCancelContractEventArgs,
-    LogFillContractEventArgs,
     OrderFilledCancelledLazyStore,
-    WithdrawalContractEventArgs,
 } from '@0xproject/contract-wrappers';
 import { schemas } from '@0xproject/json-schemas';
 import { getOrderHashHex, OrderStateUtils } from '@0xproject/order-utils';
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index ccd41fa1d..21455f67a 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -64,7 +64,7 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.12",
+        "@0xproject/assert": "0.3.0",
         "@0xproject/json-schemas": "^1.0.0",
         "@0xproject/typescript-typings": "^0.4.1",
         "@0xproject/utils": "^0.7.1",