post-merge cleanup

lib/plugins.js

@@ -69,14 +69,10 @@ function loadPlugin (name, config) {
   // each used plugin MUST be installed
   try {
     plugin = require('lamassu-' + name)
-  } catch (_) {
-  try {
-      require('plugins/' + name)
   } catch (_) {
     throw new Error(name + ' module is not installed. ' +
         'Try running \'npm install --save lamassu-' + name + '\' first')
   }
-  }
 
   // each plugin MUST implement those
   if (typeof plugin.SUPPORTED_MODULES !== 'undefined') {
@@ -358,32 +354,32 @@ exports.trade = function trade (session, rawTrade, cb) {
     async.apply(db.addOutgoingPending, session, rawTrade.currency, rawTrade.cryptoCode, rawTrade.toAddress),
     async.apply(db.recordBill, session, rawTrade)
   ], cb)
-};
+}
 
 exports.stateChange = function stateChange (session, rec, cb) {
-  var rec = {
+  var event = {
     id: rec.uuid,
     fingerprint: session.fingerprint,
     eventType: 'stateChange',
     note: JSON.stringify({state: rec.state, sessionId: session.id}),
     deviceTime: session.deviceTime
   }
-  db.machineEvent(rec, cb)
+  db.machineEvent(event, cb)
-};
+}
 
 exports.recordPing = function recordPing (session, rec, cb) {
-  var rec = {
+  var event = {
     id: uuid.v4(),
     fingerprint: session.fingerprint,
     eventType: 'ping',
     note: JSON.stringify({state: rec.state, sessionId: session.id}),
     deviceTime: session.deviceTime
   }
-  db.machineEvent(rec, cb)
+  db.machineEvent(event, cb)
-};
+}
 
 exports.sendCoins = function sendCoins (session, rawTx, cb) {
-  executeTx(session, rawTx, 'machine', cb);
+  executeTx(session, rawTx, 'machine', cb)
 }
 
 exports.cashOut = function cashOut (session, tx, cb) {

lib/postgresql_interface.js

@@ -513,41 +513,41 @@ exports.cartridgeCounts = function cartridgeCounts (session, cb) {
       var counts = results.rows.length === 1
         ? [results.rows[0].count1, results.rows[0].count2]
         : [0, 0]
-      cb(null, {id: results.rows[0].id, counts: counts});
+      cb(null, {id: results.rows[0].id, counts: counts})
-    });
+    })
-  });
+  })
-};
+}
 
 exports.machineEvent = function machineEvent (rec, cb) {
   var TTL = 2 * 60 * 60 * 1000
   connect(function (cerr, client, done) {
-    if (cerr) return cb(cerr);
+    if (cerr) return cb(cerr)
     var fields = ['id', 'device_fingerprint', 'event_type', 'note', 'device_time']
     var sql = getInsertQuery('machine_events', fields, false)
     var values = [rec.id, rec.fingerprint, rec.eventType, rec.note, rec.deviceTime]
 
-    var deleteSql = 'DELETE FROM machine_events WHERE (EXTRACT(EPOCH FROM (now() - created))) * 1000 > $1';
+    var deleteSql = 'DELETE FROM machine_events WHERE (EXTRACT(EPOCH FROM (now() - created))) * 1000 > $1'
-    var deleteValues = [TTL];
+    var deleteValues = [TTL]
 
     query(client, deleteSql, deleteValues, function (err) {
       if (err) console.error(err)
     })
 
     query(client, sql, values, function (err, results) {
-      done();
+      done()
-      return cb(err, results);
+      return cb(err, results)
-    });
+    })
-  });
+  })
-};
+}
 
 exports.devices = function devices (cb) {
   connect(function (cerr, client, done) {
-    if (cerr) return cb(cerr);
+    if (cerr) return cb(cerr)
     var sql = 'SELECT fingerprint, name FROM devices ' +
-      'WHERE authorized=$1';
+      'WHERE authorized=$1'
     query(client, sql, [true], function (err, results) {
-      done();
+      done()
-      if (err) return cb(err);
+      if (err) return cb(err)
       cb(null, results)
     })
   })
@@ -555,11 +555,11 @@ exports.devices = function devices(cb) {
 
 exports.machineEvents = function machineEvents (cb) {
   connect(function (cerr, client, done) {
-    if (cerr) return cb(cerr);
+    if (cerr) return cb(cerr)
     var sql = 'SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events'
     query(client, sql, [], function (err, results) {
-      done();
+      done()
-      if (err) return cb(err);
+      if (err) return cb(err)
       cb(null, results)
     })
   })

lib/routes.js

@@ -104,8 +104,8 @@ function poll (req, res) {
   })
 
   plugins.recordPing(session(req), req.query, function (err) {
-    if (err) console.error(err);
+    if (err) console.error(err)
-  });
+  })
 }
 
 function trade (req, res) {