From 780f2389048cfa714b03e34f9aad31768a5b53d0 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 17 Aug 2023 18:04:13 +0200 Subject: [PATCH] Fix trades duplicates if trade id is different --- freqtrade/data/converter.py | 2 +- tests/conftest.py | 3 ++- tests/data/test_history.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/freqtrade/data/converter.py b/freqtrade/data/converter.py index d2943f450..bddf311c6 100644 --- a/freqtrade/data/converter.py +++ b/freqtrade/data/converter.py @@ -203,7 +203,7 @@ def trades_remove_duplicates(trades: List[List]) -> List[List]: :param trades: List of Lists with constants.DEFAULT_TRADES_COLUMNS as columns :return: same format as above, but with duplicates removed """ - return [i for i, _ in itertools.groupby(sorted(trades, key=itemgetter(0)))] + return [i for i, _ in itertools.groupby(sorted(trades, key=itemgetter(0, 1)))] def trades_df_remove_duplicates(trades: pd.DataFrame) -> pd.DataFrame: diff --git a/tests/conftest.py b/tests/conftest.py index 5b5c8514f..4d0377796 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2346,7 +2346,8 @@ def trades_history(): [1565798399629, '1261813bb30', None, 'buy', 0.019627, 0.244, 0.004788987999999999], [1565798399752, '1261813cc31', None, 'sell', 0.019626, 0.011, 0.00021588599999999999], [1565798399862, '126181cc332', None, 'sell', 0.019626, 0.011, 0.00021588599999999999], - [1565798399872, '1261aa81333', None, 'sell', 0.019626, 0.011, 0.00021588599999999999]] + [1565798399862, '126181cc333', None, 'sell', 0.019626, 0.012, 0.00021588599999999999], + [1565798399872, '1261aa81334', None, 'sell', 0.019626, 0.011, 0.00021588599999999999]] @pytest.fixture(scope="function") diff --git a/tests/data/test_history.py b/tests/data/test_history.py index 931365c78..32b57d0cf 100644 --- a/tests/data/test_history.py +++ b/tests/data/test_history.py @@ -581,7 +581,7 @@ def test_download_trades_history(trades_history, mocker, default_conf, testdatad assert _download_trades_history(data_handler=data_handler, exchange=exchange, pair='ETH/BTC') - assert log_has("New Amount of trades: 5", caplog) + assert log_has("New Amount of trades: 6", caplog) assert file1.is_file() ght_mock.reset_mock()