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

Remove not needed argument in update_trade_state

Browse Source
This commit is contained in:
Matthias 2020-09-19 09:37:11 +02:00
parent bfd0e3553a
commit 77d0189695
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
freqtrade/data/history/history_utils.py
View File

@ -136,7 +136,6 @@ def _load_cached_data_for_updating(pair: str, timeframe: str, timerange: Optiona
start = None start = None
if timerange: if timerange:
if timerange.starttype == 'date': if timerange.starttype == 'date':
# TODO: convert to date for conversion
start = datetime.fromtimestamp(timerange.startts, tz=timezone.utc) start = datetime.fromtimestamp(timerange.startts, tz=timezone.utc)
# Intentionally don't pass timerange in - since we need to load the full dataset. # Intentionally don't pass timerange in - since we need to load the full dataset.

18
freqtrade/freqtradebot.py
View File

@ -307,8 +307,7 @@ class FreqtradeBot:
logger.info(f"Trying to refind {order}") logger.info(f"Trying to refind {order}")
fo = None fo = None
if not order.ft_is_open: if not order.ft_is_open:
# TODO: Does this need to be info level? logger.debug(f"Order {order} is no longer open.")
logger.info(f"Order {order} is no longer open.")
continue continue
if order.ft_order_side == 'buy': if order.ft_order_side == 'buy':
# Skip buy side - this is handled by reupdate_buy_order_fees # Skip buy side - this is handled by reupdate_buy_order_fees
@ -1125,7 +1124,7 @@ class FreqtradeBot:
# we need to fall back to the values from order if corder does not contain these keys. # we need to fall back to the values from order if corder does not contain these keys.
trade.amount = filled_amount trade.amount = filled_amount
trade.stake_amount = trade.amount * trade.open_rate trade.stake_amount = trade.amount * trade.open_rate
self.update_trade_state(trade, trade.open_order_id, corder, trade.amount) self.update_trade_state(trade, trade.open_order_id, corder)
trade.open_order_id = None trade.open_order_id = None
logger.info('Partial buy order timeout for %s.', trade) logger.info('Partial buy order timeout for %s.', trade)
@ -1357,16 +1356,14 @@ class FreqtradeBot:
# Common update trade state methods # Common update trade state methods
# #
def update_trade_state(self, trade: Trade, order_id: str, action_order: dict = None, def update_trade_state(self, trade: Trade, order_id: str, action_order: Dict[str, Any] = None,
order_amount: float = None, stoploss_order: bool = False) -> bool: stoploss_order: bool = False) -> bool:
""" """
Checks trades with open orders and updates the amount if necessary Checks trades with open orders and updates the amount if necessary
Handles closing both buy and sell orders. Handles closing both buy and sell orders.
:param trade: Trade object of the trade we're analyzing :param trade: Trade object of the trade we're analyzing
:param order_id: Order-id of the order we're analyzing :param order_id: Order-id of the order we're analyzing
:param action_order: Already aquired order object :param action_order: Already aquired order object
:param order_amount: Order-amount - only used in case of partially cancelled buy order
TODO: Investigate if this is really needed, or covered by getting filled in here again.
:return: True if order has been cancelled without being filled partially, False otherwise :return: True if order has been cancelled without being filled partially, False otherwise
""" """
if not order_id: if not order_id:
@ -1387,7 +1384,7 @@ class FreqtradeBot:
# Try update amount (binance-fix) # Try update amount (binance-fix)
try: try:
new_amount = self.get_real_amount(trade, order, order_amount) new_amount = self.get_real_amount(trade, order)
if not isclose(safe_value_fallback(order, 'filled', 'amount'), new_amount, if not isclose(safe_value_fallback(order, 'filled', 'amount'), new_amount,
abs_tol=constants.MATH_CLOSE_PREC): abs_tol=constants.MATH_CLOSE_PREC):
order['amount'] = new_amount order['amount'] = new_amount
@ -1425,7 +1422,7 @@ class FreqtradeBot:
return real_amount return real_amount
return amount return amount
def get_real_amount(self, trade: Trade, order: Dict, order_amount: float = None) -> float: def get_real_amount(self, trade: Trade, order: Dict) -> float:
""" """
Detect and update trade fee. Detect and update trade fee.
Calls trade.update_fee() uppon correct detection. Calls trade.update_fee() uppon correct detection.
@ -1434,8 +1431,7 @@ class FreqtradeBot:
:return: identical (or new) amount for the trade :return: identical (or new) amount for the trade
""" """
# Init variables # Init variables
if order_amount is None: order_amount = safe_value_fallback(order, 'filled', 'amount')
order_amount = safe_value_fallback(order, 'filled', 'amount')
# Only run for closed orders # Only run for closed orders
if trade.fee_updated(order.get('side', '')) or order['status'] == 'open': if trade.fee_updated(order.get('side', '')) or order['status'] == 'open':
return order_amount return order_amount