Prefer passing a provider over an ethQuery instance

2 files changed, 4 insertions, 8 deletions

diff --git a/app/scripts/controllers/recent-blocks.js b/app/scripts/controllers/recent-blocks.js
index c65c2b1c4..4ae3810eb 100644
--- a/app/scripts/controllers/recent-blocks.js
+++ b/app/scripts/controllers/recent-blocks.js
@@ -1,13 +1,14 @@
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
 const BN = require('ethereumjs-util').BN
+const EthQuery = require('eth-query')
 
 class RecentBlocksController {
 
   constructor (opts = {}) {
-    const { blockTracker, ethQuery } = opts
+    const { blockTracker, provider } = opts
     this.blockTracker = blockTracker
-    this.ethQuery = ethQuery
+    this.ethQuery = new EthQuery(provider)
     this.historyLength = opts.historyLength || 40
 
     const initState = extend({
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 81d70797a..000e17b9e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -5,7 +5,6 @@ const Dnode = require('dnode')
 const ObservableStore = require('obs-store')
 const asStream = require('obs-store/lib/asStream')
 const AccountTracker = require('./lib/account-tracker')
-const EthQuery = require('eth-query')
 const RpcEngine = require('json-rpc-engine')
 const debounce = require('debounce')
 const createEngineStream = require('json-rpc-middleware-stream/engineStream')
@@ -94,12 +93,9 @@ module.exports = class MetamaskController extends EventEmitter {
     this.provider = this.initializeProvider()
     this.blockTracker = this.provider._blockTracker
 
-    // eth data query tools
-    this.ethQuery = new EthQuery(this.provider)
-
     this.recentBlocksController = new RecentBlocksController({
       blockTracker: this.blockTracker,
-      ethQuery: this.ethQuery,
+      provider: this.provider,
     })
 
     // account tracker watches balances, nonces, and any code at their address.
@@ -142,7 +138,6 @@ module.exports = class MetamaskController extends EventEmitter {
       signTransaction: this.keyringController.signTransaction.bind(this.keyringController),
       provider: this.provider,
       blockTracker: this.blockTracker,
-      ethQuery: this.ethQuery,
       getGasPrice: this.getGasPrice.bind(this),
     })
     this.txController.on('newUnapprovedTx', opts.showUnapprovedTx.bind(opts))