Update registry middleware (#5585)

js/src/redux/middleware.js

@@ -38,7 +38,7 @@ export default function (api, browserHistory, forEmbed = false) {
 
   if (!forEmbed) {
     const certifications = new CertificationsMiddleware().toMiddleware();
-    const registry = new RegistryMiddleware(api);
+    const registry = new RegistryMiddleware(api).toMiddleware();
 
     middleware.push(certifications, registry);
   }

js/src/redux/providers/registry/middleware.js

@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { debounce } from 'lodash';
-import store from 'store';
+import lsstore from 'store';
 import Contracts from '~/contracts';
 import subscribeToEvents from '~/util/subscribe-to-events';
 
@@ -25,117 +25,50 @@ import { setReverse, startCachingReverses } from './actions';
 
 const STORE_KEY = '_parity::reverses';
 
-const read = (chain) => {
+export default class RegistryMiddleware {
-  const reverses = store.get(`${STORE_KEY}::${chain}::data`);
+  contract;
-  const lastBlock = store.get(`${STORE_KEY}::${chain}::lastBlock`);
+  interval;
-
+  store;
-  if (!reverses || !lastBlock) {
+  subscription;
-    return null;
+  timeout;
-  }
-  return { reverses, lastBlock };
-};
-
-const write = debounce((getChain, getReverses, getLastBlock) => {
-  const chain = getChain();
-  const reverses = getReverses();
-  const lastBlock = getLastBlock();
-
-  store.set(`${STORE_KEY}::${chain}::data`, reverses);
-  store.set(`${STORE_KEY}::${chain}::lastBlock`, lastBlock);
-}, 20000);
-
-export default (api) => (store) => {
-  let contract;
-  let subscription;
-  let timeout;
-  let interval;
-
-  let addressesToCheck = {};
-
-  const onLog = (log) => {
-    switch (log.event) {
-      case 'ReverseConfirmed':
-        addressesToCheck[log.params.reverse.value] = true;
-
-        break;
-      case 'ReverseRemoved':
-        delete addressesToCheck[log.params.reverse.value];
-
-        break;
-    }
-  };
-
-  const checkReverses = () => {
-    Object
-      .keys(addressesToCheck)
-      .forEach((address) => {
-        contract
-          .instance
-          .reverse
-          .call({}, [ address ])
-          .then((reverse) => {
-            store.dispatch(setReverse(address, reverse));
-          });
-      });
 
   addressesToCheck = {};
-  };
+
+  constructor (api) {
+    this._api = api;
+  }
+
+  toMiddleware () {
+    return (store) => {
+      this.store = store;
 
       return (next) => (action) => {
         switch (action.type) {
           case 'initAll':
             next(action);
             store.dispatch(startCachingReverses());
-
             break;
 
           case 'startCachingReverses':
-        const { registry } = Contracts.get();
+            this.cacheReverses();
-        const cached = read(store.getState().nodeStatus.netChain);
-
-        if (cached) {
-          Object
-            .entries(cached.reverses)
-            .forEach(([ address, reverse ]) => store.dispatch(setReverse(address, reverse)));
-        }
-
-        registry.getInstance()
-          .then((instance) => api.newContract(registryABI, instance.address))
-          .then((_contract) => {
-            contract = _contract;
-
-            subscription = subscribeToEvents(_contract, [
-              'ReverseConfirmed', 'ReverseRemoved'
-            ], {
-              from: cached ? cached.lastBlock : 0
-            });
-            subscription.on('log', onLog);
-
-            timeout = setTimeout(checkReverses, 10000);
-            interval = setInterval(checkReverses, 20000);
-          })
-          .catch((err) => {
-            console.error('Failed to start caching reverses:', err);
-            throw err;
-          });
-
             break;
+
           case 'stopCachingReverses':
-        if (subscription) {
+            if (this.subscription) {
-          subscription.unsubscribe();
+              this.subscription.unsubscribe();
             }
-        if (interval) {
+            if (this.interval) {
-          clearInterval(interval);
+              clearInterval(this.interval);
             }
-        if (timeout) {
+            if (this.timeout) {
-          clearTimeout(timeout);
+              clearTimeout(this.timeout);
             }
 
-        write.flush();
+            this.write.flush();
             break;
 
           case 'setReverse':
-        write(
+            this.write(
               () => store.getState().nodeStatus.netChain,
               () => store.getState().registry.reverse,
               () => +store.getState().nodeStatus.blockNumber
@@ -148,3 +81,84 @@ export default (api) => (store) => {
         }
       };
     };
+  }
+
+  cacheReverses () {
+    const { registry } = Contracts.get();
+    const cached = this.read(this.store.getState().nodeStatus.netChain);
+
+    if (cached) {
+      Object
+        .entries(cached.reverses)
+        .forEach(([ address, reverse ]) => this.store.dispatch(setReverse(address, reverse)));
+    }
+
+    registry.getInstance()
+      .then((instance) => this._api.newContract(registryABI, instance.address))
+      .then((_contract) => {
+        this.contract = _contract;
+
+        this.subscription = subscribeToEvents(this.contract, [
+          'ReverseConfirmed', 'ReverseRemoved'
+        ], {
+          from: cached ? cached.lastBlock : 0
+        });
+        this.subscription.on('log', this.onLog);
+
+        this.timeout = setTimeout(this.checkReverses, 10000);
+        this.interval = setInterval(this.checkReverses, 20000);
+      })
+      .catch((err) => {
+        console.error('Failed to start caching reverses:', err);
+        throw err;
+      });
+  }
+
+  checkReverses = () => {
+    Object
+      .keys(this.addressesToCheck)
+      .forEach((address) => {
+        this.contract
+          .instance
+          .reverse
+          .call({}, [ address ])
+          .then((reverse) => {
+            this.store.dispatch(setReverse(address, reverse));
+          });
+      });
+
+    this.addressesToCheck = {};
+  };
+
+  onLog = (log) => {
+    switch (log.event) {
+      case 'ReverseConfirmed':
+        this.addressesToCheck[log.params.reverse.value] = true;
+
+        break;
+      case 'ReverseRemoved':
+        delete this.addressesToCheck[log.params.reverse.value];
+
+        break;
+    }
+  };
+
+  read = (chain) => {
+    const reverses = lsstore.get(`${STORE_KEY}::${chain}::data`);
+    const lastBlock = lsstore.get(`${STORE_KEY}::${chain}::lastBlock`);
+
+    if (!reverses || !lastBlock) {
+      return null;
+    }
+    return { reverses, lastBlock };
+  };
+
+  write = debounce((getChain, getReverses, getLastBlock) => {
+    const chain = getChain();
+    const reverses = getReverses();
+    const lastBlock = getLastBlock();
+
+    lsstore.set(`${STORE_KEY}::${chain}::data`, reverses);
+    lsstore.set(`${STORE_KEY}::${chain}::lastBlock`, lastBlock);
+  }, 20000);
+}