remove zeroConf stuff, which is moved over to Raqia

lib/plugins.js

@@ -211,14 +211,10 @@ function buildCartridges(counts) {
 }
 
 exports.pollQueries = function pollQueries(session, cb) {
-  async.parallel([
+  db.cartridgeCounts(session, function(err, result) {
-    async.apply(db.dispenseStatus, session),
-    async.apply(db.cartridgeCounts, session)
-  ], function(err, results) {
     if (err) return cb(err);
     return cb(null, {
-      dispenseStatus: results[0],
+      cartridges: buildCartridges(result)
-      cartridges: buildCartridges(results[1])
     });
   });
 };
@@ -346,10 +342,6 @@ exports.cashOut = function cashOut(session, tx, cb) {
   });
 };
 
-exports.dispenseStatus = function dispenseStatus(session, cb) {
-  db.dispenseStatus(session, cb);
-};
-
 exports.dispenseAck = function dispenseAck(session, tx) {
   db.addDispense(session, tx);
 };

lib/postgresql_interface.js

@@ -514,52 +514,6 @@ exports.addInitialIncoming = function addInitialIncoming(session, tx, cb) {
   });
 };
 
-function lastTxStatus(client, session, cb) {
-  var sql = 'SELECT satoshis, stage, authority FROM transactions ' +
-    'WHERE device_fingerprint=$1 AND session_id=$2 AND incoming=$3 ' +
-    'ORDER BY id DESC LIMIT 1';
-  var values = [session.fingerprint, session.id, true];
-
-  query(client, sql, values, cb);
-}
-
-function initialRequest(client, session, cb) {
-  var sql = 'SELECT fiat, satoshis FROM transactions ' +
-    'WHERE device_fingerprint=$1 AND session_id=$2 AND incoming=$3 ' +
-    'AND stage=$4';
-  var values = [session.fingerprint, session.id, true, 'initial_request'];
-
-  query(client, sql, values, cb);
-}
-
-exports.dispenseStatus = function dispenseStatus(session, cb) {
-  connect(function(cerr, client, done) {
-    if (cerr) return cb(cerr);
-
-    async.parallel([
-      async.apply(initialRequest, client, session),
-      async.apply(lastTxStatus, client, session)
-    ], function(err, results) {
-      done();
-      if (err) return cb(err);
-
-      var pending = (results[0].rows.length === 1) &&
-        (results[1].rows.length === 1) &&
-        (results[1].rows[0].stage === 'deposit');
-      if (!pending) return cb(null, null);
-
-      var requestedTx = results[0].rows[0];
-      var lastTx = results[1].rows[0];
-
-      // TODO: handle multiple deposits
-      var status = (lastTx.satoshis < requestedTx.satoshis) ?
-        'insufficientFunds' :
-        lastTx.authority;
-      cb(null, {status: status, fiat: requestedTx.fiat});
-    });
-  });
-};
-
 function lastDispenseCount(client, session, transactionId, cb) {
   var sql = 'SELECT count1, count2 FROM dispenses ' +
     'WHERE device_fingerprint=$1 ' +

lib/routes.js

@@ -61,7 +61,6 @@ function poll(req, res) {
       fiat: fiatBalance,
       locale: config.brain.locale,
       txLimit: parseInt(complianceSettings.maximum.limit, 10),
-      dispenseStatus: results.dispenseStatus,
       idVerificationEnabled: complianceSettings.idVerificationEnabled,
       cartridges: cartridges,
       twoWayMode: cartridges ? true : false