Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial

2 files changed, 5 insertions, 3 deletions

diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js
index 7e01fa386..dd671943f 100644
--- a/app/scripts/controllers/blacklist.js
+++ b/app/scripts/controllers/blacklist.js
@@ -4,8 +4,8 @@ const PhishingDetector = require('eth-phishing-detect/src/detector')
 
 // compute phishing lists
 const PHISHING_DETECTION_CONFIG = require('eth-phishing-detect/src/config.json')
-// every ten minutes
-const POLLING_INTERVAL = 10 * 60 * 1000
+// every four minutes
+const POLLING_INTERVAL = 4 * 60 * 1000
 
 class BlacklistController {
 
@@ -41,6 +41,7 @@ class BlacklistController {
 
   scheduleUpdates () {
     if (this._phishingUpdateIntervalRef) return
+    this.updatePhishingList()
     this._phishingUpdateIntervalRef = setInterval(() => {
       this.updatePhishingList()
     }, POLLING_INTERVAL)
diff --git a/app/scripts/lib/nodeify.js b/app/scripts/lib/nodeify.js
index 299bfe624..832d6c6d3 100644
--- a/app/scripts/lib/nodeify.js
+++ b/app/scripts/lib/nodeify.js
@@ -1,9 +1,10 @@
 const promiseToCallback = require('promise-to-callback')
 
-module.exports = function(fn, context) {
+module.exports = function nodeify (fn, context) {
   return function(){
     const args = [].slice.call(arguments)
     const callback = args.pop()
+    if (typeof callback !== 'function') throw new Error('callback is not a function')
     promiseToCallback(fn.apply(context, args))(callback)
   }
 }