refactored getEventsInBlockRange

Author: julianlen

lib/rsk-utils.js

@@ -593,18 +593,10 @@ const findEventInBlock = async (rskTxHelper, eventName, fromBlockNumber, toBlock
         );
         for (let i = 0; i < bridgeTransactions.length; i++) {
             const tx = bridgeTransactions[i];
-            const event = tx.events.find((event) => {
-                return event.name === eventName;
-            });
-            if (event) {
-                if (check) {
-                    const found = await check(event, tx);
-                    if (!found) {
-                        continue;
-                    }
-                }
-                return event;
-            }
+            const event = tx.events.find((event) => event.name === eventName);
+            if (!event) continue;
+            if (check && !(await check(event, tx))) continue;
+            return event;
         }
     }
     return null;