diff --git a/lib/routes.js b/lib/routes.js index 0463aaae..4611d98d 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -29,12 +29,17 @@ var poll = function(req, res) { // `rateRec` and `satoshiBalanceRec` are both objects, so there's no danger // of misinterpreting rate or balance === 0 as 'Server initializing'. - if (!rateRec || !satoshiBalanceRec) + if (!rateRec || !satoshiBalanceRec) { return res.json({err: 'Server initializing'}); - if (Date.now() - rateRec.timestamp > STALE_TICKER) + } + + if (Date.now() - rateRec.timestamp > STALE_TICKER) { return res.json({err: 'Stale ticker'}); - if (Date.now() - rateRec.timestamp > STALE_BALANCE) + } + + if (Date.now() - rateRec.timestamp > STALE_BALANCE) { return res.json({err: 'Stale balance'}); + } var rate = rateRec.rate; @@ -47,13 +52,6 @@ var poll = function(req, res) { }); }; -// TODO need to add in a UID for this trade -var trade = function(req, res) { - api.trade.trade(req.body.fiat, req.body.satoshis, req.body.currency, function(err) { - res.json({err: err}); - }); -}; - var send = function(req, res) { var fingerprint = req.connection.getPeerCertificate().fingerprint; _trader.sendBitcoins(fingerprint, req.body, function(err, txHash) { @@ -70,8 +68,11 @@ var pair = function(req, res) { req.connection.getPeerCertificate().fingerprint, name, function(err) { - if (err) res.json(500, { err: err.message }); - else res.json(200); + if (err) { + return res.json(500, { err: err.message }); + } + + res.json(200); } ); }; @@ -80,7 +81,6 @@ exports.init = function(app, trader, authMiddleware) { _trader = trader; app.get('/poll/:currency', authMiddleware, poll); - app.post('/trade', authMiddleware, trade); app.post('/send', authMiddleware, send); app.post('/pair', pair);