From caee0dbe2693e99ebbb8a88204c679645fcd6377 Mon Sep 17 00:00:00 2001 From: Artem Tiumentcev Date: Wed, 13 Dec 2017 14:09:47 +0300 Subject: [PATCH] Refactor method for notification. --- lib/engine.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/engine.js b/lib/engine.js index 2fe392518d..69df07a2fd 100644 --- a/lib/engine.js +++ b/lib/engine.js @@ -75,6 +75,12 @@ module.exports = function container (get, set, clear) { } } + function pushMessage(str) { + if (so.mode === 'live' || so.mode === 'paper') { + notify.pushMessage(str) + } + } + function fa (amt) { return n(amt).format('0.00000000') + ' ' + s.asset } @@ -184,7 +190,7 @@ module.exports = function container (get, set, clear) { s.start_price = n(quote.ask).value() s.start_capital = n(s.balance.currency).add(n(s.balance.asset).multiply(quote.ask)).value() - notify.pushMessage('Balance ' + s.exchange.name.toUpperCase(), 'sync balance ' + s.start_capital + ' ' + s.currency + '\n') + pushMessage('Balance ' + s.exchange.name.toUpperCase(), 'sync balance ' + s.start_capital + ' ' + s.currency + '\n') cb() }) @@ -451,9 +457,7 @@ module.exports = function container (get, set, clear) { }, c.wait_for_settlement) } else { - if (so.mode === 'live' || so.mode === 'paper') { - notify.pushMessage('Buying ' + s.exchange.name.toUpperCase(), 'placing buy order at ' + fc(price) + ', ' + fc(quote.bid - Number(price)) + ' under best bid\n') - } + pushMessage('Buying ' + s.exchange.name.toUpperCase(), 'placing buy order at ' + fc(price) + ', ' + fc(quote.bid - Number(price)) + ' under best bid\n') doOrder() } } @@ -494,9 +498,7 @@ module.exports = function container (get, set, clear) { }, c.wait_for_settlement) } else { - if (so.mode === 'live' || so.mode === 'paper') { - notify.pushMessage('Selling ' + s.exchange.name.toUpperCase(), 'placing sell order at ' + fc(price) + ', ' + fc(Number(price) - quote.bid) + ' over best ask\n') - } + pushMessage('Selling ' + s.exchange.name.toUpperCase(), 'placing sell order at ' + fc(price) + ', ' + fc(Number(price) - quote.bid) + ' over best ask\n') doOrder() } } @@ -586,9 +588,7 @@ module.exports = function container (get, set, clear) { if (so.stats) { order_complete = '\nbuy order completed at ' + moment(trade.time).format('YYYY-MM-DD HH:mm:ss') + ':\n\n' + fa(my_trade.size) + ' at ' + fc(my_trade.price) + '\ntotal ' + fc(my_trade.size * my_trade.price) + '\n' + n(my_trade.slippage).format('0.0000%') + ' slippage (orig. price ' + fc(s.buy_order.orig_price) + ')\nexecution: ' + moment.duration(my_trade.execution_time).humanize() + '\n' console.log((order_complete).cyan) - if (so.mode === 'live' || so.mode === 'paper') { - notify.pushMessage('Buy ' + s.exchange.name.toUpperCase(), order_complete) - } + pushMessage('Buy ' + s.exchange.name.toUpperCase(), order_complete) } s.last_buy_price = my_trade.price delete s.buy_order @@ -638,9 +638,7 @@ module.exports = function container (get, set, clear) { if (so.stats) { order_complete = '\nsell order completed at ' + moment(trade.time).format('YYYY-MM-DD HH:mm:ss') + ':\n\n' + fa(my_trade.size) + ' at ' + fc(my_trade.price) + '\ntotal ' + fc(my_trade.size * my_trade.price) + '\n' + n(my_trade.slippage).format('0.0000%') + ' slippage (orig. price ' + fc(s.sell_order.orig_price) + ')\nexecution: ' + moment.duration(my_trade.execution_time).humanize() + '\n' console.log((order_complete).cyan) - if (so.mode === 'live' || so.mode === 'paper') { - notify.pushMessage('Sell ' + s.exchange.name.toUpperCase(), order_complete) - } + pushMessage('Sell ' + s.exchange.name.toUpperCase(), order_complete) } s.last_sell_price = my_trade.price delete s.sell_order