From ee4a6c8f5c7dcd8321cb1606417ba38b028ee393 Mon Sep 17 00:00:00 2001
From: Gerardo Nardelli <gerardo.nardelli@altoros.com>
Date: Thu, 25 Jul 2019 14:44:05 -0300
Subject: [PATCH] Fix amb events in monitor

---
 monitor/utils/message.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/monitor/utils/message.js b/monitor/utils/message.js
index 069c3715..dda2bba5 100644
--- a/monitor/utils/message.js
+++ b/monitor/utils/message.js
@@ -11,9 +11,7 @@ function deliveredMsgNotProcessed(processedList) {
     )
     return (
       processedList.filter(processedMsg => {
-        processedMsg.returnValues.txHash =
-          processedMsg.returnValues.transactionHash || processedMsg.returnValues.txHash
-        return messagesEquals(msg, processedMsg.returnValues)
+        return messageEqualsEvent(msg, processedMsg.returnValues)
       }).length === 0
     )
   }
@@ -21,8 +19,6 @@ function deliveredMsgNotProcessed(processedList) {
 
 function processedMsgNotDelivered(deliveredList) {
   return processedMsg => {
-    processedMsg.returnValues.txHash =
-      processedMsg.returnValues.transactionHash || processedMsg.returnValues.txHash
     return (
       deliveredList.filter(deliveredMsg => {
         const msg = parseAMBMessage(
@@ -31,17 +27,17 @@ function processedMsgNotDelivered(deliveredList) {
             transactionHash: deliveredMsg.transactionHash
           })
         )
-        return messagesEquals(msg, processedMsg.returnValues)
+        return messageEqualsEvent(msg, processedMsg.returnValues)
       }).length === 0
     )
   }
 }
 
-function messagesEquals(a, b) {
+function messageEqualsEvent(parsedMsg, event) {
   return (
-    web3Utils.toChecksumAddress(a.sender) === b.sender &&
-    web3Utils.toChecksumAddress(a.executor) === b.executor &&
-    a.txHash === b.txHash
+    web3Utils.toChecksumAddress(parsedMsg.sender) === event.sender &&
+    web3Utils.toChecksumAddress(parsedMsg.executor) === event.executor &&
+    parsedMsg.txHash === event.transactionHash
   )
 }