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') {
@@ -267,7 +263,7 @@ function executeTx (session, tx, authority, cb) {
     if (cryptoAtomsToSend === 0) {
       logger.debug('No cryptoAtoms to send')
       return cb(null, {statusCode: 204, txId: tx.txId, txHash: null})
-}
+    }
 
     var cryptoCode = tx.cryptoCode
     _sendCoins(tx.toAddress, cryptoAtomsToSend, cryptoCode, function (_err, txHash) {
@@ -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) {
+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) {
+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) {
+exports.sendCoins = function sendCoins (session, rawTx, cb) {
-  executeTx(session, rawTx, 'machine', cb);
+  executeTx(session, rawTx, 'machine', cb)
 }
 
 exports.cashOut = function cashOut (session, tx, cb) {
@@ -459,7 +455,7 @@ function startTrader (cryptoCode) {
     function () { executeTrades(cryptoCode) },
     cachedConfig.exchanges.settings.tradeInterval
   )
-  }
+}
 
 function stopTrader (cryptoCode) {
   if (!tradeIntervals[cryptoCode]) return
@@ -468,7 +464,7 @@ function stopTrader (cryptoCode) {
   clearInterval(tradeIntervals[cryptoCode])
   tradeIntervals[cryptoCode] = null
   tradesQueues[cryptoCode] = []
-  }
+}
 
 function pollBalance (cryptoCode, cb) {
   logger.debug('[%s] collecting balance', cryptoCode)

lib/postgresql_interface.js

@@ -52,7 +52,7 @@ exports.init = function init (_conString) {
   if (!conString) {
     throw new Error('Postgres connection string is required')
   }
-  }
+}
 
 function connect (cb) {
   pg.connect(conString, function (err, client, done) {
@@ -109,7 +109,7 @@ exports.recordDeviceEvent = function recordDeviceEvent (session, event) {
       event.deviceTime]
     client.query(sql, values, done)
   })
-      }
+}
 
 function query (client, queryStr, values, cb) {
   if (!cb) {
@@ -367,7 +367,7 @@ exports.addOutgoingTx = function addOutgoingTx (session, tx, cb) {
       })
     })
   })
-      }
+}
 
 exports.sentCoins = function sentCoins (session, tx, authority, toSend, fee,
   error, txHash) {
@@ -438,7 +438,7 @@ exports.addOutgoingPending = function addOutgoingPending (session, currencyCode,
       })
     })
   })
-      }
+}
 
 exports.addInitialIncoming = function addInitialIncoming (session, tx, cb) {
   connect(function (cerr, client, done) {
@@ -460,7 +460,7 @@ exports.addInitialIncoming = function addInitialIncoming (session, tx, cb) {
       })
     })
   })
-      }
+}
 
 function insertDispense (client, session, tx, cartridges, transactionId, cb) {
   var fields = [
@@ -513,53 +513,53 @@ 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) {
+exports.machineEvent = function machineEvent (rec, cb) {
   var TTL = 2 * 60 * 60 * 1000
-  connect(function(cerr, client, done) {
+  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) {
+    query(client, deleteSql, deleteValues, function (err) {
       if (err) console.error(err)
     })
 
-    query(client, sql, values, function(err, results) {
+    query(client, sql, values, function (err, results) {
-      done();
+      done()
-      return cb(err, results);
+      return cb(err, results)
-    });
+    })
-  });
+  })
-};
+}
 
-exports.devices = function devices(cb) {
+exports.devices = function devices (cb) {
-  connect(function(cerr, client, done) {
+  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) {
+    query(client, sql, [true], function (err, results) {
-      done();
+      done()
-      if (err) return cb(err);
+      if (err) return cb(err)
       cb(null, results)
     })
   })
 }
 
-exports.machineEvents = function machineEvents(cb) {
+exports.machineEvents = function machineEvents (cb) {
-  connect(function(cerr, client, done) {
+  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) {
+    query(client, sql, [], function (err, results) {
-      done();
+      done()
-      if (err) return cb(err);
+      if (err) return cb(err)
       cb(null, results)
     })
   })

lib/routes.js

@@ -43,7 +43,7 @@ function buildRates () {
   })
 
   return rates
-  }
+}
 
 function buildBalances () {
   var cryptoCodes = plugins.getcryptoCodes()
@@ -55,7 +55,7 @@ function buildBalances () {
   })
 
   return _balances
-  }
+}
 
 function poll (req, res) {
   var fingerprint = getFingerprint(req)
@@ -103,9 +103,9 @@ function poll (req, res) {
     res.json(response)
   })
 
-  plugins.recordPing(session(req), req.query, function(err) {
+  plugins.recordPing(session(req), req.query, function (err) {
-    if (err) console.error(err);
+    if (err) console.error(err)
-  });
+  })
 }
 
 function trade (req, res) {
@@ -119,8 +119,8 @@ function trade (req, res) {
   })
 }
 
-function stateChange(req, res) {
+function stateChange (req, res) {
-  plugins.stateChange(session(req), req.body, function(err) {
+  plugins.stateChange(session(req), req.body, function (err) {
     if (err) console.error(err)
     res.json(200)
   })