From 46653a02683071e9ad35e5c378876a6400fd934c Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Sat, 21 Apr 2018 17:04:20 -0700
Subject: Reorder event args

---
 .../current/protocol/Exchange/MixinExchangeCore.sol  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages/contracts/src')

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
index 10985d6d3..d4801a8fd 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
@@ -53,21 +53,21 @@ contract MixinExchangeCore is
         address indexed makerAddress,
         address takerAddress,
         address indexed feeRecipientAddress,
-        bytes makerAssetData,
-        bytes takerAssetData,
         uint256 makerAssetFilledAmount,
         uint256 takerAssetFilledAmount,
         uint256 makerFeePaid,
         uint256 takerFeePaid,
-        bytes32 indexed orderHash
+        bytes32 indexed orderHash,
+        bytes makerAssetData,
+        bytes takerAssetData
     );
 
     event Cancel(
         address indexed makerAddress,
         address indexed feeRecipientAddress,
+        bytes32 indexed orderHash,
         bytes makerAssetData,
-        bytes takerAssetData,
-        bytes32 indexed orderHash
+        bytes takerAssetData
     );
 
     event CancelUpTo(
@@ -153,13 +153,13 @@ contract MixinExchangeCore is
             order.makerAddress,
             msg.sender,
             order.feeRecipientAddress,
-            order.makerAssetData,
-            order.takerAssetData,
             fillResults.makerAssetFilledAmount,
             fillResults.takerAssetFilledAmount,
             fillResults.makerFeePaid,
             fillResults.takerFeePaid,
-            orderHash
+            orderHash,
+            order.makerAssetData,
+            order.takerAssetData
         );
         return fillResults;
     }
@@ -195,9 +195,9 @@ contract MixinExchangeCore is
         emit Cancel(
             order.makerAddress,
             order.feeRecipientAddress,
+            orderHash,
             order.makerAssetData,
-            order.takerAssetData,
-            orderHash
+            order.takerAssetData
         );
         return true;
     }
-- 
cgit