From 5fe231b6890a22ec578250fc1f37b58d263669b4 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Sun, 25 Aug 2019 16:40:25 -0700
Subject: [PATCH] Reorder Cancel event args for consistency

---
 contracts/exchange/contracts/src/MixinExchangeCore.sol      | 6 +++---
 .../exchange/contracts/src/interfaces/IExchangeCore.sol     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contracts/exchange/contracts/src/MixinExchangeCore.sol b/contracts/exchange/contracts/src/MixinExchangeCore.sol
index ee118aa74a..42b4b6c541 100644
--- a/contracts/exchange/contracts/src/MixinExchangeCore.sol
+++ b/contracts/exchange/contracts/src/MixinExchangeCore.sol
@@ -315,10 +315,10 @@ contract MixinExchangeCore is
         emit Cancel(
             order.makerAddress,
             order.feeRecipientAddress,
-            msg.sender,
-            orderHash,
             order.makerAssetData,
-            order.takerAssetData
+            order.takerAssetData,
+            msg.sender,
+            orderHash
         );
     }
 
diff --git a/contracts/exchange/contracts/src/interfaces/IExchangeCore.sol b/contracts/exchange/contracts/src/interfaces/IExchangeCore.sol
index 871c47155a..72b2417d80 100644
--- a/contracts/exchange/contracts/src/interfaces/IExchangeCore.sol
+++ b/contracts/exchange/contracts/src/interfaces/IExchangeCore.sol
@@ -48,10 +48,10 @@ contract IExchangeCore {
     event Cancel(
         address indexed makerAddress,         // Address that created the order.
         address indexed feeRecipientAddress,  // Address that would have recieved fees if order was filled.
-        address senderAddress,                // Address that called the Exchange contract (msg.sender).
-        bytes32 indexed orderHash,            // EIP712 hash of order (see LibOrder.getTypedDataHash).
         bytes makerAssetData,                 // Encoded data specific to makerAsset.
-        bytes takerAssetData                  // Encoded data specific to takerAsset.
+        bytes takerAssetData,                 // Encoded data specific to takerAsset.
+        address senderAddress,                // Address that called the Exchange contract (msg.sender).
+        bytes32 indexed orderHash             // EIP712 hash of order (see LibOrder.getTypedDataHash).
     );
 
     // CancelUpTo event is emitted whenever `cancelOrdersUpTo` is executed succesfully.