From 61a42cc7e4a93ba7c2097285f82505d5a854341b Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 9 Jan 2017 16:59:33 +0100
Subject: [PATCH] reverse caching: pass API into middleware

---
 js/src/redux/middleware.js                    |   4 +-
 js/src/redux/providers/registry/middleware.js | 153 +++++++++---------
 2 files changed, 76 insertions(+), 81 deletions(-)

diff --git a/js/src/redux/middleware.js b/js/src/redux/middleware.js
index 5cb635f7f..bffeddc98 100644
--- a/js/src/redux/middleware.js
+++ b/js/src/redux/middleware.js
@@ -33,7 +33,7 @@ export default function (api, browserHistory) {
   const certifications = new CertificationsMiddleware();
   const routeMiddleware = routerMiddleware(browserHistory);
   const chain = new ChainMiddleware();
-  const registry = new RegistryMiddleware();
+  const registry = new RegistryMiddleware(api);
 
   const middleware = [
     settings.toMiddleware(),
@@ -41,7 +41,7 @@ export default function (api, browserHistory) {
     errors.toMiddleware(),
     certifications.toMiddleware(),
     chain.toMiddleware(),
-    registry.toMiddleware()
+    registry
   ];
 
   return middleware.concat(status, routeMiddleware, thunk);
diff --git a/js/src/redux/providers/registry/middleware.js b/js/src/redux/providers/registry/middleware.js
index 87d9fbf70..2c8b45d0e 100644
--- a/js/src/redux/providers/registry/middleware.js
+++ b/js/src/redux/providers/registry/middleware.js
@@ -21,90 +21,85 @@ import registryABI from '~/contracts/abi/registry.json';
 
 import { setReverse, startCachingReverses } from './actions';
 
-export default class RegistryMiddleware {
-  toMiddleware () {
-    return (store) => {
-      const api = Contracts.get()._api;
-      let contract, confirmedEvents, removedEvents, timeout, interval;
+export default (api) => (store) => {
+  let contract, confirmedEvents, removedEvents, timeout, interval;
 
-      let addressesToCheck = {};
+  let addressesToCheck = {};
 
-      const onLog = (log) => {
-        switch (log.event) {
-          case 'ReverseConfirmed':
-            addressesToCheck[log.params.reverse.value] = true;
+  const onLog = (log) => {
+    switch (log.event) {
+      case 'ReverseConfirmed':
+        addressesToCheck[log.params.reverse.value] = true;
 
-            break;
-          case 'ReverseRemoved':
-            delete addressesToCheck[log.params.reverse.value];
+        break;
+      case 'ReverseRemoved':
+        delete addressesToCheck[log.params.reverse.value];
 
-            break;
-        }
-      };
+        break;
+    }
+  };
 
-      const checkReverses = () => {
-        Object
-          .keys(addressesToCheck)
-          .forEach((address) => {
-            contract
-              .instance
-              .reverse
-              .call({}, [ address ])
-              .then((reverse) => store.dispatch(setReverse(address, reverse)));
+  const checkReverses = () => {
+    Object
+      .keys(addressesToCheck)
+      .forEach((address) => {
+        contract
+          .instance
+          .reverse
+          .call({}, [ address ])
+          .then((reverse) => store.dispatch(setReverse(address, reverse)));
+      });
+
+    addressesToCheck = {};
+  };
+
+  return (next) => (action) => {
+    switch (action.type) {
+      case 'initAll':
+        next(action);
+        store.dispatch(startCachingReverses());
+
+        break;
+      case 'startCachingReverses':
+        const { registry } = Contracts.get();
+
+        registry.getInstance()
+          .then((instance) => api.newContract(registryABI, instance.address))
+          .then((_contract) => {
+            contract = _contract;
+
+            confirmedEvents = subscribeToEvent(_contract, 'ReverseConfirmed');
+            confirmedEvents.on('log', onLog);
+
+            removedEvents = subscribeToEvent(_contract, 'ReverseRemoved');
+            removedEvents.on('log', onLog);
+
+            timeout = setTimeout(checkReverses, 5000);
+            interval = setInterval(checkReverses, 20000);
+          })
+          .catch((err) => {
+            console.error('Failed to start caching reverses:', err);
+            throw err;
           });
 
-        addressesToCheck = {};
-      };
-
-      return (next) => (action) => {
-        switch (action.type) {
-          case 'initAll':
-            next(action);
-            store.dispatch(startCachingReverses());
-
-            break;
-          case 'startCachingReverses':
-            const { registry } = Contracts.get();
-
-            registry.getInstance()
-              .then((instance) => api.newContract(registryABI, instance.address))
-              .then((_contract) => {
-                contract = _contract;
-
-                confirmedEvents = subscribeToEvent(_contract, 'ReverseConfirmed');
-                confirmedEvents.on('log', onLog);
-
-                removedEvents = subscribeToEvent(_contract, 'ReverseRemoved');
-                removedEvents.on('log', onLog);
-
-                timeout = setTimeout(checkReverses, 5000);
-                interval = setInterval(checkReverses, 20000);
-              })
-              .catch((err) => {
-                console.error('Failed to start caching reverses:', err);
-                throw err;
-              });
-
-            break;
-          case 'stopCachingReverses':
-            if (confirmedEvents) {
-              confirmedEvents.unsubscribe();
-            }
-            if (removedEvents) {
-              removedEvents.unsubscribe();
-            }
-            if (interval) {
-              clearInterval(interval);
-            }
-            if (timeout) {
-              clearTimeout(timeout);
-            }
-
-            break;
-          default:
-            next(action);
+        break;
+      case 'stopCachingReverses':
+        if (confirmedEvents) {
+          confirmedEvents.unsubscribe();
         }
-      };
-    };
-  }
-}
+        if (removedEvents) {
+          removedEvents.unsubscribe();
+        }
+        if (interval) {
+          clearInterval(interval);
+        }
+        if (timeout) {
+          clearTimeout(timeout);
+        }
+
+        break;
+      default:
+        next(action);
+    }
+  };
+};