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

Fix default argument handling for timeframe_to_nextdate

Browse Source
This commit is contained in:
Matthias 2019-08-12 20:37:11 +02:00
parent 23a70932d2
commit ca739f71fb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/exchange/exchange.py
View File

@ -801,7 +801,7 @@ def timeframe_to_prev_date(timeframe: str, date: datetime = None) -> datetime:
:returns: date of previous candle (with utc timezone) :returns: date of previous candle (with utc timezone)
""" """
if not date: if not date:
date = datetime.utcnow() date = datetime.now(timezone.utc)
timeframe_secs = timeframe_to_seconds(timeframe) timeframe_secs = timeframe_to_seconds(timeframe)
# Get offset based on timerame_secs # Get offset based on timerame_secs
offset = date.timestamp() % timeframe_secs offset = date.timestamp() % timeframe_secs

6
freqtrade/tests/exchange/test_exchange.py
View File

@ -1588,6 +1588,9 @@ def test_timeframe_to_prev_date():
for interval, result in tf_list: for interval, result in tf_list:
assert timeframe_to_prev_date(interval, date) == result assert timeframe_to_prev_date(interval, date) == result
date = datetime.now(tz=timezone.utc)
assert timeframe_to_prev_date("5m", date) < date
def test_timeframe_to_next_date(): def test_timeframe_to_next_date():
# 2019-08-12 13:22:08 # 2019-08-12 13:22:08
@ -1609,3 +1612,6 @@ def test_timeframe_to_next_date():
for interval, result in tf_list: for interval, result in tf_list:
assert timeframe_to_next_date(interval, date) == result assert timeframe_to_next_date(interval, date) == result
date = datetime.now(tz=timezone.utc)
assert timeframe_to_next_date("5m", date) > date