removed auto-reload.js, moved global web3 export to inpage.js

2 files changed, 16 insertions, 43 deletions

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index cbbcbb00e..070f5d247 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -3,7 +3,6 @@ cleanContextForImports()
 require('web3/dist/web3.min.js')
 const log = require('loglevel')
 const LocalMessageDuplexStream = require('post-message-stream')
-const exportWeb3Global = require('./lib/auto-reload.js')
 const MetamaskInpageProvider = require('./lib/inpage-provider.js')
 restoreContextAfterImports()
 
@@ -40,23 +39,22 @@ web3.setProvider = function () {
 log.debug('MetaMask - injected web3')
 
 // export global web3, with usage-detection and deprecation warning
-exportWeb3Global(web3)
-// let hasBeenWarned = false
-// global.web3 = new Proxy(web3, {
-//   get: (_web3, key) => {
-//     // show warning once on web3 access
-//     if (!hasBeenWarned && key !== 'currentProvider') {
-//       console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation')
-//       hasBeenWarned = true
-//     }
-//     // return value normally
-//     return _web3[key]
-//   },
-//   set: (_web3, key, value) => {
-//     // set value normally
-//     _web3[key] = value
-//   },
-// })
+let hasBeenWarned = false
+global.web3 = new Proxy(web3, {
+  get: (_web3, key) => {
+    // show warning once on web3 access
+    if (!hasBeenWarned && key !== 'currentProvider') {
+      console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation')
+      hasBeenWarned = true
+    }
+    // return value normally
+    return _web3[key]
+  },
+  set: (_web3, key, value) => {
+    // set value normally
+    _web3[key] = value
+  },
+})
 
 // set web3 defaultAccount
 inpageProvider.publicConfigStore.subscribe(function (state) {
diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js
deleted file mode 100644
index 63dc3e921..000000000
--- a/app/scripts/lib/auto-reload.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = exportWeb3Global
-
-function exportWeb3Global (web3) {
-  // export web3 as a global, checking for usage
-  let hasBeenWarned = false
-  let lastTimeUsed
-
-  global.web3 = new Proxy(web3, {
-    get: (_web3, key) => {
-      // show warning once on web3 access
-      if (!hasBeenWarned && key !== 'currentProvider') {
-        console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation')
-        hasBeenWarned = true
-      }
-      // get the time of use
-      lastTimeUsed = Date.now()
-      // return value normally
-      return _web3[key]
-    },
-    set: (_web3, key, value) => {
-      // set value normally
-      _web3[key] = value
-    },
-  })
-}