lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged with latest

Browse source
This commit is contained in:
Josh Harvey 2014-07-18 17:29:10 -04:00
commit fc52975f45
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/routes.js
View file

@ -18,7 +18,7 @@ function prepareApi(req, res) {
var poll = function(req, res) { var poll = function(req, res) {
var rateRec = _trader.rate(); var rateRec = _trader.rate();
var balanceRec = _trader.balance; var balanceRec = _trader.balance;
var fingerprint = req.connection.getPeerCertificate().fingerprint; var fingerprint = getFingerprint(req);
var api = prepareApi(req, res); var api = prepareApi(req, res);
logger.debug('poll request from: %s', fingerprint); logger.debug('poll request from: %s', fingerprint);
@ -53,7 +53,7 @@ var poll = function(req, res) {
}; };
var trade = function (req, res) { var trade = function (req, res) {
var fingerprint = req.connection.getPeerCertificate().fingerprint; var fingerprint = getFingerprint(req);
var api = prepareApi(req, res); var api = prepareApi(req, res);
_trader.trade(req.body, fingerprint); _trader.trade(req.body, fingerprint);
api.respond(); api.respond();
@ -67,7 +67,7 @@ var deviceEvent = function deviceEvent(req, res) {
}; };
var idVerify = function idVerify(req, res) { var idVerify = function idVerify(req, res) {
var fingerprint = req.connection.getPeerCertificate().fingerprint; // var fingerprint = req.connection.getPeerCertificate().fingerprint;
var api = prepareApi(req, res); var api = prepareApi(req, res);
_idVerifier.verify(req.body, function (err, idResult) { _idVerifier.verify(req.body, function (err, idResult) {
api.respond(err, idResult); api.respond(err, idResult);
@ -75,7 +75,7 @@ var idVerify = function idVerify(req, res) {
}; };
var send = function(req, res) { var send = function(req, res) {
var fingerprint = req.connection.getPeerCertificate().fingerprint; var fingerprint = getFingerprint(req);
var api = prepareApi(req, res); var api = prepareApi(req, res);
_trader.sendBitcoins(fingerprint, req.body, function(err, txHash) { _trader.sendBitcoins(fingerprint, req.body, function(err, txHash) {
api.respond(err, {txHash: txHash}); api.respond(err, {txHash: txHash});
@ -89,7 +89,7 @@ var pair = function(req, res) {
_lamassuConfig.pair( _lamassuConfig.pair(
token, token,
req.connection.getPeerCertificate().fingerprint, getFingerprint(req),
name, name,
function(err) { function(err) {
if (err) return api.respond(err, null, 500); if (err) return api.respond(err, null, 500);
@ -119,3 +119,8 @@ exports.init = function(config) {
return app; return app;
}; };
function getFingerprint(req) {
return req.connection.getPeerCertificate &&
req.connection.getPeerCertificate().fingerprint;
}

6
test/unit/traderSendTest.js
View file

@ -37,7 +37,8 @@ describe('trader/send', function () {
assert.equal(SATOSHIS, satoshis); assert.equal(SATOSHIS, satoshis);
assert.equal(transactionFee, TRANSACTION_FEE); assert.equal(transactionFee, TRANSACTION_FEE);
callback(null, TXID); callback(null, TXID);
} },
balance: function () {}
}; };
trader.sendBitcoins(FINGERPRINT, { trader.sendBitcoins(FINGERPRINT, {
@ -57,7 +58,8 @@ describe('trader/send', function () {
trader.transferExchange = { trader.transferExchange = {
sendBitcoins: function () { sendBitcoins: function () {
throw new Error('This should not have been called'); throw new Error('This should not have been called');
} },
balance: function () {}
}; };
trader.sendBitcoins(FINGERPRINT, { trader.sendBitcoins(FINGERPRINT, {