refactor(db): remove unnecessary dependency injection for DB

mozilla · Mar 27, 2017 · cbad916 · cbad916
1 parent a6b97a7
commit cbad916
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 32 deletions.
diff --git a/bin/email_notifications.js b/bin/email_notifications.js
@@ -13,12 +13,7 @@ var delivery = require('../lib/email/delivery')(log)
 var DB = require('../lib/db')(
   config,
   log,
-  error,
-  Token.SessionToken,
-  Token.KeyFetchToken,
-  Token.AccountResetToken,
-  Token.PasswordForgotToken,
-  Token.PasswordChangeToken
+  Token
 )
 
 var bounceQueue = new SQSReceiver(config.emailNotifications.region, [

diff --git a/bin/key_server.js b/bin/key_server.js
@@ -79,12 +79,7 @@ function run(config) {
   var DB = require('../lib/db')(
     config,
     log,
-    error,
-    Token.SessionToken,
-    Token.KeyFetchToken,
-    Token.AccountResetToken,
-    Token.PasswordForgotToken,
-    Token.PasswordChangeToken,
+    Token,
     UnblockCode
   )
 

diff --git a/lib/db.js b/lib/db.js
@@ -4,25 +4,27 @@
 
 'use strict'
 
+const error = require('./error')
 const P = require('./promise')
 const Pool = require('./pool')
 const userAgent = require('./userAgent')
 
 const bufferize = require('./crypto/butil').bufferize
 const random = require('./crypto/random')
 
-module.exports = function (
+module.exports = (
   config,
   log,
-  error,
-  SessionToken,
-  KeyFetchToken,
-  AccountResetToken,
-  PasswordForgotToken,
-  PasswordChangeToken,
-  UnblockCode) {
+  Token,
+  UnblockCode
+  ) => {
 
   const features = require('./features')(config)
+  const SessionToken = Token.SessionToken
+  const KeyFetchToken = Token.KeyFetchToken
+  const AccountResetToken = Token.AccountResetToken
+  const PasswordForgotToken = Token.PasswordForgotToken
+  const PasswordChangeToken = Token.PasswordChangeToken
 
   function DB(options) {
     this.pool = new Pool(options.url)

diff --git a/test/remote/db_tests.js b/test/remote/db_tests.js
@@ -25,12 +25,7 @@ const Token = require('../../lib/tokens')(log, {
 const DB = require('../../lib/db')(
   { lastAccessTimeUpdates: lastAccessTimeUpdates },
   log,
-  Token.error,
-  Token.SessionToken,
-  Token.KeyFetchToken,
-  Token.AccountResetToken,
-  Token.PasswordForgotToken,
-  Token.PasswordChangeToken,
+  Token,
   UnblockCode
 )
 

diff --git a/test/remote/push_db_tests.js b/test/remote/push_db_tests.js
@@ -18,12 +18,7 @@ var Token = require('../../lib/tokens')(log)
 const DB = require('../../lib/db')(
   config,
   log,
-  Token.error,
-  Token.SessionToken,
-  Token.KeyFetchToken,
-  Token.AccountResetToken,
-  Token.PasswordForgotToken,
-  Token.PasswordChangeToken
+  Token
 )
 
 var zeroBuffer16 = Buffer('00000000000000000000000000000000', 'hex')