From f12937a21e3bf98c8690c576f0a05c31cc08c0db Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 9 Jan 2017 19:03:19 +0100
Subject: [PATCH] reverse caching: use subscribeToEvents

---
 js/src/contracts/verification.js              |  2 +-
 js/src/redux/providers/registry/middleware.js | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/js/src/contracts/verification.js b/js/src/contracts/verification.js
index af2f3b3a7..3940e0e18 100644
--- a/js/src/contracts/verification.js
+++ b/js/src/contracts/verification.js
@@ -72,7 +72,7 @@ export const awaitPuzzle = (api, contract, account) => {
   return blockNumber(api)
     .then((block) => {
       return new Promise((resolve, reject) => {
-        const subscription = subscribeToEvents(contract, 'Puzzled', {
+        const subscription = subscribeToEvents(contract, ['Puzzled'], {
           from: block.toNumber(),
           filter: (log) => log.params.who.value === account
         });
diff --git a/js/src/redux/providers/registry/middleware.js b/js/src/redux/providers/registry/middleware.js
index 2c8b45d0e..136a9eb08 100644
--- a/js/src/redux/providers/registry/middleware.js
+++ b/js/src/redux/providers/registry/middleware.js
@@ -15,14 +15,14 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import Contracts from '~/contracts';
-import subscribeToEvent from '~/util/subscribe-to-event';
+import subscribeToEvents from '~/util/subscribe-to-events';
 
 import registryABI from '~/contracts/abi/registry.json';
 
 import { setReverse, startCachingReverses } from './actions';
 
 export default (api) => (store) => {
-  let contract, confirmedEvents, removedEvents, timeout, interval;
+  let contract, subscription, timeout, interval;
 
   let addressesToCheck = {};
 
@@ -68,11 +68,8 @@ export default (api) => (store) => {
           .then((_contract) => {
             contract = _contract;
 
-            confirmedEvents = subscribeToEvent(_contract, 'ReverseConfirmed');
-            confirmedEvents.on('log', onLog);
-
-            removedEvents = subscribeToEvent(_contract, 'ReverseRemoved');
-            removedEvents.on('log', onLog);
+            subscription = subscribeToEvents(_contract, ['ReverseConfirmed', 'ReverseRemoved']);
+            subscription.on('log', onLog);
 
             timeout = setTimeout(checkReverses, 5000);
             interval = setInterval(checkReverses, 20000);
@@ -84,11 +81,8 @@ export default (api) => (store) => {
 
         break;
       case 'stopCachingReverses':
-        if (confirmedEvents) {
-          confirmedEvents.unsubscribe();
-        }
-        if (removedEvents) {
-          removedEvents.unsubscribe();
+        if (subscription) {
+          subscription.unsubscribe();
         }
         if (interval) {
           clearInterval(interval);