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

Simplify date rounding logic

Browse Source
This commit is contained in:
Matthias 2021-11-14 19:55:56 +01:00
parent e7499b7c44
commit 1b058d882d
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/exchange/exchange.py
View File

@ -1763,13 +1763,7 @@ class Exchange:
d = datetime.fromtimestamp(int(candle[0] / 1000), timezone.utc) d = datetime.fromtimestamp(int(candle[0] / 1000), timezone.utc)
# Round down to the nearest hour, in case of a delayed timestamp # Round down to the nearest hour, in case of a delayed timestamp
# The millisecond timestamps can be delayed ~20ms # The millisecond timestamps can be delayed ~20ms
time = datetime( time = timeframe_to_prev_date('1h', d).timestamp() * 1000
d.year,
d.month,
d.day,
d.hour,
tzinfo=timezone.utc
).timestamp() * 1000
opening_mark_price = candle[1] opening_mark_price = candle[1]
history[time] = opening_mark_price history[time] = opening_mark_price
return history return history
@ -1805,13 +1799,8 @@ class Exchange:
if self.funding_fee_cutoff(open_date): if self.funding_fee_cutoff(open_date):
open_date += timedelta(hours=1) open_date += timedelta(hours=1)
open_date = datetime(
open_date.year, open_date = timeframe_to_prev_date('1h', open_date)
open_date.month,
open_date.day,
open_date.hour,
tzinfo=timezone.utc
)
fees: float = 0 fees: float = 0
if not close_date: if not close_date: