Chore: post-rebase fixes

lib/plugins.js

@@ -25,8 +25,6 @@ const promoCodes = require('./promo-codes')
 
 const notifier = require('./notifier')
 
-const notifier = require('./notifier/index')
-
 const mapValuesWithKey = _.mapValues.convert({
   cap: false
 })
@@ -164,41 +162,30 @@ function plugins (settings, deviceId) {
           ? argv.cassettes.split(',')
           : rec.counts
 
-    return Promise.all([
-      dbm.cassetteCounts(deviceId),
-      cashOutHelper.redeemableTxs(deviceId, excludeTxId)
-    ]).then(([rec, _redeemableTxs]) => {
-      const redeemableTxs = _.reject(
-        _.matchesProperty('id', excludeTxId),
-        _redeemableTxs
-      )
+        const cassettes = [
+          {
+            denomination: parseInt(denominations[0], 10),
+            count: parseInt(counts[0], 10)
+          },
+          {
+            denomination: parseInt(denominations[1], 10),
+            count: parseInt(counts[1], 10)
+          }
+        ]
 
-      const counts = argv.cassettes ? argv.cassettes.split(',') : rec.counts
-
-      const cassettes = [
-        {
-          denomination: parseInt(denominations[0], 10),
-          count: parseInt(counts[0], 10)
-        },
-        {
-          denomination: parseInt(denominations[1], 10),
-          count: parseInt(counts[1], 10)
+        try {
+          return {
+            cassettes: computeAvailableCassettes(cassettes, redeemableTxs),
+            virtualCassettes
+          }
+        } catch (err) {
+          logger.error(err)
+          return {
+            cassettes,
+            virtualCassettes
+          }
         }
-      ]
-
-      try {
-        return {
-          cassettes: computeAvailableCassettes(cassettes, redeemableTxs),
-          virtualCassettes
-        }
-      } catch (err) {
-        logger.error(err)
-        return {
-          cassettes,
-          virtualCassettes
-        }
-      }
-    })
+      })
   }
 
   function fetchCurrentConfigVersion () {