Skip to content

Commit 4523585

Browse files
committed
refactor: simplify some date calculations
1 parent 37c10c9 commit 4523585

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

freqtrade/configuration/timerange.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from freqtrade.constants import DATETIME_PRINT_FORMAT
1212
from freqtrade.exceptions import ConfigurationError
13+
from freqtrade.util import dt_from_ts
1314

1415

1516
logger = logging.getLogger(__name__)
@@ -37,13 +38,13 @@ def __init__(
3738
@property
3839
def startdt(self) -> datetime | None:
3940
if self.startts:
40-
return datetime.fromtimestamp(self.startts, tz=timezone.utc)
41+
return dt_from_ts(self.startts)
4142
return None
4243

4344
@property
4445
def stopdt(self) -> datetime | None:
4546
if self.stopts:
46-
return datetime.fromtimestamp(self.stopts, tz=timezone.utc)
47+
return dt_from_ts(self.stopts)
4748
return None
4849

4950
@property

freqtrade/freqtradebot.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
)
6565
from freqtrade.strategy.interface import IStrategy
6666
from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper
67-
from freqtrade.util import FtPrecise, MeasureTime
67+
from freqtrade.util import FtPrecise, MeasureTime, dt_from_ts
6868
from freqtrade.util.migrations.binance_mig import migrate_binance_futures_names
6969
from freqtrade.wallets import Wallets
7070

@@ -533,9 +533,8 @@ def handle_onexchange_order(self, trade: Trade) -> bool:
533533
logger.info(f"Found previously unknown order {order['id']} for {trade.pair}.")
534534

535535
order_obj = Order.parse_from_ccxt_object(order, trade.pair, order["side"])
536-
order_obj.order_filled_date = datetime.fromtimestamp(
537-
safe_value_fallback(order, "lastTradeTimestamp", "timestamp") // 1000,
538-
tz=timezone.utc,
536+
order_obj.order_filled_date = dt_from_ts(
537+
safe_value_fallback(order, "lastTradeTimestamp", "timestamp")
539538
)
540539
trade.orders.append(order_obj)
541540
Trade.commit()

freqtrade/persistence/trade_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def update_from_ccxt_object(self, order):
215215
self.stop_price = safe_value_fallback(order, "stopPrice", default_value=self.stop_price)
216216
order_date = safe_value_fallback(order, "timestamp")
217217
if order_date:
218-
self.order_date = datetime.fromtimestamp(order_date / 1000, tz=timezone.utc)
218+
self.order_date = dt_from_ts(order_date)
219219
elif not self.order_date:
220220
self.order_date = dt_now()
221221

0 commit comments

Comments
 (0)