From 0c8264801ac15952861724ecd6a2620dc3055e5e Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 5 Jul 2018 17:23:26 +0200
Subject: Fix tests

---
 .../contract-wrappers/src/artifacts/Exchange.json  | 45 ++++++++--------------
 packages/contract-wrappers/src/index.ts            |  2 +-
 .../test/exchange_wrapper_test.ts                  | 10 ++++-
 .../contract-wrappers/test/utils/web3_wrapper.ts   |  2 +-
 4 files changed, 26 insertions(+), 33 deletions(-)

(limited to 'packages/contract-wrappers')

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
@@ -1026,28 +1026,6 @@
                 "stateMutability": "view",
                 "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": [],
@@ -1305,6 +1283,20 @@
                 "stateMutability": "nonpayable",
                 "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);
-- 
cgit v1.2.3