From 7c78dff386f9f6dd3eb8e725686c84c049d64390 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Wed, 10 May 2017 17:50:23 +0200
Subject: [PATCH] Updates after merge (last remaining middleware nigglies)

---
 js/src/shared/redux/middleware.js             | 30 +++++++++----------
 .../providers/certifications/middleware.js    | 18 ++++++-----
 .../redux/providers/registry/middleware.js    |  2 +-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/js/src/shared/redux/middleware.js b/js/src/shared/redux/middleware.js
index 32abb3d53..2d8b36aec 100644
--- a/js/src/shared/redux/middleware.js
+++ b/js/src/shared/redux/middleware.js
@@ -17,6 +17,7 @@ import thunk from 'redux-thunk';
 import { routerMiddleware } from 'react-router-redux';
 
 import ErrorsMiddleware from '~/ui/Errors/middleware';
+
 import SettingsMiddleware from './providers/settings/middleware';
 import SignerMiddleware from './providers/signerMiddleware';
 
@@ -25,25 +26,24 @@ import ChainMiddleware from './providers/chainMiddleware';
 import RegistryMiddleware from './providers/registry/middleware';
 
 export default function (api, browserHistory, forEmbed = false) {
-  const errors = new ErrorsMiddleware();
-  const signer = new SignerMiddleware(api);
-  const settings = new SettingsMiddleware();
-  const chain = new ChainMiddleware();
   const middleware = [
-    settings.toMiddleware(),
-    signer.toMiddleware(),
-    errors.toMiddleware(),
-    chain.toMiddleware()
+    new SettingsMiddleware().toMiddleware(),
+    new SignerMiddleware(api).toMiddleware(),
+    new ErrorsMiddleware().toMiddleware(),
+    new ChainMiddleware().toMiddleware()
   ];
 
   if (!forEmbed) {
-    const certifications = new CertificationsMiddleware(api).toMiddleware();
-    const registry = new RegistryMiddleware(api).toMiddleware();
-
-    middleware.push(certifications, registry);
+    middleware.push(
+      new CertificationsMiddleware(api).toMiddleware(),
+      new RegistryMiddleware(api).toMiddleware()
+    );
   }
 
-  const routeMiddleware = browserHistory ? routerMiddleware(browserHistory) : [];
-
-  return middleware.concat(routeMiddleware, thunk);
+  return middleware.concat(
+    browserHistory
+      ? routerMiddleware(browserHistory)
+      : [],
+    thunk
+  );
 }
diff --git a/js/src/shared/redux/providers/certifications/middleware.js b/js/src/shared/redux/providers/certifications/middleware.js
index fa47c0f7e..010bb7743 100644
--- a/js/src/shared/redux/providers/certifications/middleware.js
+++ b/js/src/shared/redux/providers/certifications/middleware.js
@@ -63,9 +63,10 @@ export default class CertificationsMiddleware {
   }
 
   toMiddleware () {
-    const badgeReg = Contracts.get(this._api).badgeReg;
+    const api = this._api;
+    const badgeReg = Contracts.get(api).badgeReg;
 
-    const contract = new Contract(this._api, CertifierABI);
+    const contract = new Contract(api, CertifierABI);
     const Confirmed = contract.events.find((e) => e.name === 'Confirmed');
     const Revoked = contract.events.find((e) => e.name === 'Revoked');
 
@@ -77,12 +78,12 @@ export default class CertificationsMiddleware {
       let badgeRegFilter = null;
       let fetchCertifiersPromise = null;
 
-      const updateFilter = updatableFilter(this._api, (filterId) => {
+      const updateFilter = updatableFilter(api, (filterId) => {
         filterChanged = true;
         filter = filterId;
       });
 
-      const badgeRegUpdateFilter = updatableFilter(this._api, (filterId) => {
+      const badgeRegUpdateFilter = updatableFilter(api, (filterId) => {
         filterChanged = true;
         badgeRegFilter = filterId;
       });
@@ -100,7 +101,7 @@ export default class CertificationsMiddleware {
         .then(() => {
           shortFetchChanges();
 
-          this._api.subscribe('eth_blockNumber', (err) => {
+          api.subscribe('eth_blockNumber', (err) => {
             if (err) {
               return;
             }
@@ -128,7 +129,8 @@ export default class CertificationsMiddleware {
       }
 
       function onBadgeRegLogs (logs) {
-        return badgeReg.getContract()
+        return badgeReg
+          .getContract()
           .then((badgeRegContract) => {
             logs = badgeRegContract.parseEventLogs(logs);
 
@@ -145,12 +147,12 @@ export default class CertificationsMiddleware {
 
         filterChanged = false;
 
-        this._api.eth[method](badgeRegFilter)
+        api.eth[method](badgeRegFilter)
           .then(onBadgeRegLogs)
           .catch((err) => {
             console.error('Failed to fetch badge reg events:', err);
           })
-          .then(() => this._api.eth[method](filter))
+          .then(() => api.eth[method](filter))
           .then(onLogs)
           .catch((err) => {
             console.error('Failed to fetch new certifier events:', err);
diff --git a/js/src/shared/redux/providers/registry/middleware.js b/js/src/shared/redux/providers/registry/middleware.js
index 8e3d3e0a3..b3bb85ba9 100644
--- a/js/src/shared/redux/providers/registry/middleware.js
+++ b/js/src/shared/redux/providers/registry/middleware.js
@@ -84,7 +84,7 @@ export default class RegistryMiddleware {
   }
 
   cacheReverses () {
-    const { registry } = Contracts.get();
+    const { registry } = Contracts.get(this._api);
     const cached = this.read(this.store.getState().nodeStatus.netChain);
 
     if (cached) {