adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpc refactor 10/

Browse Source 
cleanups
two tests are broken
This commit is contained in:
kryofly
2018-01-26 14:10:10 +01:00
parent 11bf579cc3
commit 28dded5807
5 changed files with 100 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
freqtrade/rpc/__init__.py
View File

@@ -65,28 +65,6 @@ def shorten_date(_date):
return new_date
def _exec_forcesell(trade: Trade) -> None:
# Check if there is there is an open order
if trade.open_order_id:
order = exchange.get_order(trade.open_order_id)
# Cancel open LIMIT_BUY orders and close trade
if order and not order['closed'] and order['type'] == 'LIMIT_BUY':
exchange.cancel_order(trade.open_order_id)
trade.close(order.get('rate') or trade.open_rate)
# TODO: sell amount which has been bought already
return
# Ignore trades with an attached LIMIT_SELL order
if order and not order['closed'] and order['type'] == 'LIMIT_SELL':
return
# Get current rate and execute sell
current_rate = exchange.get_ticker(trade.pair, False)['bid']
from freqtrade.main import execute_sell
execute_sell(trade, current_rate)
#
# Below follows the RPC backend
# it is prefixed with rpc_
@@ -387,6 +365,27 @@ def rpc_forcesell(trade_id) -> None:
Sells the given trade at current price
:return: error or None
"""
def _exec_forcesell(trade: Trade) -> None:
# Check if there is there is an open order
if trade.open_order_id:
order = exchange.get_order(trade.open_order_id)
# Cancel open LIMIT_BUY orders and close trade
if order and not order['closed'] and order['type'] == 'LIMIT_BUY':
exchange.cancel_order(trade.open_order_id)
trade.close(order.get('rate') or trade.open_rate)
# TODO: sell amount which has been bought already
return
# Ignore trades with an attached LIMIT_SELL order
if order and not order['closed'] and order['type'] == 'LIMIT_SELL':
return
# Get current rate and execute sell
current_rate = exchange.get_ticker(trade.pair, False)['bid']
from freqtrade.main import execute_sell
execute_sell(trade, current_rate)
if get_state() != State.RUNNING:
return (True, '`trader is not running`')
@@ -402,8 +401,8 @@ def rpc_forcesell(trade_id) -> None:
Trade.is_open.is_(True)
)).first()
if not trade:
logger.warning('/forcesell: Invalid argument received')
return (True, 'Invalid argument. See `/help` to view usage')
logger.warning('forcesell: Invalid argument received')
return (True, 'Invalid argument.')
_exec_forcesell(trade)

25
freqtrade/rpc/telegram.py
View File

@@ -18,9 +18,8 @@ from freqtrade.rpc.__init__ import (rpc_status_table,
rpc_count,
)
from freqtrade import __version__, exchange
from freqtrade import __version__
from freqtrade.fiat_convert import CryptoToFiatConverter
from freqtrade.persistence import Trade
# Remove noisy log messages
@@ -400,28 +399,6 @@ def _version(bot: Bot, update: Update) -> None:
send_msg('*Version:* `{}`'.format(__version__), bot=bot)
def _exec_forcesell(trade: Trade) -> None:
# Check if there is there is an open order
if trade.open_order_id:
order = exchange.get_order(trade.open_order_id)
# Cancel open LIMIT_BUY orders and close trade
if order and not order['closed'] and order['type'] == 'LIMIT_BUY':
exchange.cancel_order(trade.open_order_id)
trade.close(order.get('rate') or trade.open_rate)
# TODO: sell amount which has been bought already
return
# Ignore trades with an attached LIMIT_SELL order
if order and not order['closed'] and order['type'] == 'LIMIT_SELL':
return
# Get current rate and execute sell
current_rate = exchange.get_ticker(trade.pair, False)['bid']
from freqtrade.main import execute_sell
execute_sell(trade, current_rate)
def send_msg(msg: str, bot: Bot = None, parse_mode: ParseMode = ParseMode.MARKDOWN) -> None:
"""
Send given markdown message