From a4afd44af15d0de42e155cbf646411c4e676271f Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Sun, 22 Jun 2014 09:47:09 -0400 Subject: [PATCH 1/2] fixed a test --- test/unit/traderSendTest.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/unit/traderSendTest.js b/test/unit/traderSendTest.js index fcac1dde..3bf65091 100644 --- a/test/unit/traderSendTest.js +++ b/test/unit/traderSendTest.js @@ -37,7 +37,8 @@ describe('trader/send', function () { assert.equal(SATOSHIS, satoshis); assert.equal(transactionFee, TRANSACTION_FEE); callback(null, TXID); - } + }, + balance: function () {} }; trader.sendBitcoins(FINGERPRINT, { @@ -57,7 +58,8 @@ describe('trader/send', function () { trader.transferExchange = { sendBitcoins: function () { throw new Error('This should not have been called'); - } + }, + balance: function () {} }; trader.sendBitcoins(FINGERPRINT, { From bcf565e158f88997c6bb285386e27e78a7ec239a Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Fri, 18 Jul 2014 17:22:59 -0400 Subject: [PATCH 2/2] Better handling of fingerprint --- lib/routes.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/routes.js b/lib/routes.js index 57bbfff7..83a3b9f5 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -21,7 +21,7 @@ Error.prototype.toJSON = function () { var poll = function(req, res) { var rateRec = _trader.rate(); var balanceRec = _trader.balance; - var fingerprint = req.connection.getPeerCertificate().fingerprint; + var fingerprint = getFingerprint(req); logger.debug('poll request from: %s', fingerprint); @@ -55,13 +55,13 @@ var poll = function(req, res) { }; var trade = function (req, res) { - var fingerprint = req.connection.getPeerCertificate().fingerprint; + var fingerprint = getFingerprint(req); _trader.trade(req.body, fingerprint); res.json({err: null}); }; var send = function(req, res) { - var fingerprint = req.connection.getPeerCertificate().fingerprint; + var fingerprint = getFingerprint(req); _trader.sendBitcoins(fingerprint, req.body, function(err, txHash) { res.json({ err: err && err.message, @@ -77,7 +77,7 @@ var pair = function(req, res) { _lamassuConfig.pair( token, - req.connection.getPeerCertificate().fingerprint, + getFingerprint(req), name, function(err) { if (err) { @@ -100,3 +100,8 @@ exports.init = function(app, config, trader, authMiddleware) { return app; }; + +function getFingerprint(req) { + return req.connection.getPeerCertificate && + req.connection.getPeerCertificate().fingerprint; +} \ No newline at end of file