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

Rename update_trade method

Browse Source
This commit is contained in:
Matthias 2022-02-10 19:18:19 +01:00
parent c13eed2178
commit 1b1216fc87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/freqtradebot.py
View File

@ -1362,7 +1362,8 @@ class FreqtradeBot(LoggingMixin):
if not order_obj: if not order_obj:
# TODO: this can't happen! # TODO: this can't happen!
raise OperationalException("order-obj not found!") raise OperationalException("order-obj not found!")
trade.update(order_obj) trade.update_trade(order_obj)
# TODO: is the below necessary? it's already done in update_trade for filled buys
trade.recalc_trade_from_orders() trade.recalc_trade_from_orders()
Trade.commit() Trade.commit()

7
freqtrade/persistence/models.py
View File

@ -151,7 +151,7 @@ class Order(_DECL_BASE):
return (f'Order(id={self.id}, order_id={self.order_id}, trade_id={self.ft_trade_id}, ' return (f'Order(id={self.id}, order_id={self.order_id}, trade_id={self.ft_trade_id}, '
f'side={self.side}, order_type={self.order_type}, status={self.status})') f'side={self.side}, order_type={self.order_type}, status={self.status})')
def update_from_ccxt_object(self, order): def update_from_ccxt_object(self, order) -> 'Order':
""" """
Update Order from ccxt response Update Order from ccxt response
Only updates if fields are available from ccxt - Only updates if fields are available from ccxt -
@ -178,6 +178,7 @@ class Order(_DECL_BASE):
if (order.get('filled', 0.0) or 0.0) > 0: if (order.get('filled', 0.0) or 0.0) > 0:
self.order_filled_date = datetime.now(timezone.utc) self.order_filled_date = datetime.now(timezone.utc)
self.order_update_date = datetime.now(timezone.utc) self.order_update_date = datetime.now(timezone.utc)
return self
def to_json(self) -> Dict[str, Any]: def to_json(self) -> Dict[str, Any]:
return { return {
@ -462,14 +463,14 @@ class LocalTrade():
f"Trailing stoploss saved us: " f"Trailing stoploss saved us: "
f"{float(self.stop_loss) - float(self.initial_stop_loss):.8f}.") f"{float(self.stop_loss) - float(self.initial_stop_loss):.8f}.")
def update(self, order: Order) -> None: def update_trade(self, order: Order) -> None:
""" """
Updates this entity with amount and actual open/close rates. Updates this entity with amount and actual open/close rates.
:param order: order retrieved by exchange.fetch_order() :param order: order retrieved by exchange.fetch_order()
:return: None :return: None
""" """
# Ignore open and cancelled orders # Ignore open and cancelled orders
if order.status == 'open' or safe_value_fallback(order, 'average', 'price') is None: if order.status == 'open' or order.safe_price is None:
return return
logger.info(f'Updating trade (id={self.id}) ...') logger.info(f'Updating trade (id={self.id}) ...')