Merge branch 'master' into upstream-master

lib/routes.js

@@ -21,6 +21,8 @@ function poll(req, res) {
   var rateRec = plugins.getDeviceRate();
   var balanceRec = plugins.getBalance();
 
+  logger.debug('poll request from: %s', getFingerprint(req));
+
   // `rateRec` and `balanceRec` are both objects, so there's no danger
   // of misinterpreting rate or balance === 0 as 'Server initializing'.
   if (!rateRec || !balanceRec) {

test/mocks/db.js

@@ -29,7 +29,11 @@ module.exports = {
   completeTransaction: function(tx, txHash) {
     calls.status = true;
   },
-  recordBill: function(fingerprint, trade) { }
+  recordBill: function(fingerprint, trade) { },
+  addOutgoingTx: function(session, tx, cb) {
+    cb(null, {satoshis: tx.satoshis});
+  },
+  sentCoins: function() {}
 };
 
 

test/mocks/info.js

@@ -6,5 +6,6 @@ module.exports = {
 
   config: function config() {},
   getAddressLastTx: function verifyUser() {},
-  getTx: function verifyTransaction() {}
+  getTx: function verifyTransaction() {},
+  checkAddress: function checkAddress() {}
 };

test/mocks/wallet.js

@@ -42,5 +42,3 @@ module.exports.getBalanceCalls = function() {
 module.exports.wasSendCalled = function() {
   return calls.send;
 };
-
-

test/plugins.js

@@ -209,7 +209,7 @@ describe('Plugins', function() {
           /* jshint expr: true */
           response.should.be.an.Object;
           response.should.have.property('statusCode');
-          response.statusCode.should.equal(204);
+          response.statusCode.should.equal(201);
           /* jshint expr: false */
 
           done();