From 30cff1bd2ca7481c60d9bafa761ad03fd6ea006f Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 27 Mar 2022 16:38:12 +0200
Subject: [PATCH] Update hdf5 to not raise naturalNaming warnings

---
 freqtrade/data/history/hdf5datahandler.py     |   4 +++-
 tests/data/test_history.py                    |   4 ++--
 tests/test_misc.py                            |   2 ++
 ...-mark.h5 => UNITTEST_USDT_USDT-1h-mark.h5} | Bin 37751 -> 72922 bytes
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename tests/testdata/futures/{UNITTEST_USDT-1h-mark.h5 => UNITTEST_USDT_USDT-1h-mark.h5} (51%)

diff --git a/freqtrade/data/history/hdf5datahandler.py b/freqtrade/data/history/hdf5datahandler.py
index db96bdf21..23120a4ba 100644
--- a/freqtrade/data/history/hdf5datahandler.py
+++ b/freqtrade/data/history/hdf5datahandler.py
@@ -206,7 +206,9 @@ class HDF5DataHandler(IDataHandler):
 
     @classmethod
     def _pair_ohlcv_key(cls, pair: str, timeframe: str) -> str:
-        return f"{pair}/ohlcv/tf_{timeframe}"
+        # Escape futures pairs to avoid warnings
+        pair_esc = pair.replace(':', '_')
+        return f"{pair_esc}/ohlcv/tf_{timeframe}"
 
     @classmethod
     def _pair_trades_key(cls, pair: str) -> str:
diff --git a/tests/data/test_history.py b/tests/data/test_history.py
index 43a3aaefd..0585fa0d4 100644
--- a/tests/data/test_history.py
+++ b/tests/data/test_history.py
@@ -683,7 +683,7 @@ def test_datahandler_ohlcv_get_pairs(testdatadir):
     assert set(pairs) == {'XRP/USDT'}
 
     pairs = HDF5DataHandler.ohlcv_get_pairs(testdatadir, '1h', candle_type=CandleType.MARK)
-    assert set(pairs) == {'UNITTEST/USDT'}
+    assert set(pairs) == {'UNITTEST/USDT:USDT'}
 
 
 @pytest.mark.parametrize('filename,pair,timeframe,candletype', [
@@ -914,7 +914,7 @@ def test_hdf5datahandler_trades_purge(mocker, testdatadir):
     # Data goes from 2018-01-10 - 2018-01-30
     ('UNITTEST/BTC', '5m', 'spot',  '', '2018-01-15', '2018-01-19'),
     # Mark data goes from to 2021-11-15 2021-11-19
-    ('UNITTEST/USDT', '1h', 'mark', '-mark', '2021-11-16', '2021-11-18'),
+    ('UNITTEST/USDT:USDT', '1h', 'mark', '-mark', '2021-11-16', '2021-11-18'),
 ])
 def test_hdf5datahandler_ohlcv_load_and_resave(
     testdatadir,
diff --git a/tests/test_misc.py b/tests/test_misc.py
index d28050dfb..107932be4 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -73,6 +73,8 @@ def test_file_load_json(mocker, testdatadir) -> None:
     ("ETH/BTC", 'ETH_BTC'),
     ("ETH/USDT", 'ETH_USDT'),
     ("ETH/USDT:USDT", 'ETH_USDT_USDT'),  # swap with USDT as settlement currency
+    ("ETH/USD:USD", 'ETH_USD_USD'),  # swap with USD as settlement currency
+    ("AAVE/USD:USD", 'AAVE_USD_USD'),  # swap with USDT as settlement currency
     ("ETH/USDT:USDT-210625", 'ETH_USDT_USDT-210625'),  # expiring futures
     ("Fabric Token/ETH", 'Fabric_Token_ETH'),
     ("ETHH20", 'ETHH20'),
diff --git a/tests/testdata/futures/UNITTEST_USDT-1h-mark.h5 b/tests/testdata/futures/UNITTEST_USDT_USDT-1h-mark.h5
similarity index 51%
rename from tests/testdata/futures/UNITTEST_USDT-1h-mark.h5
rename to tests/testdata/futures/UNITTEST_USDT_USDT-1h-mark.h5
index ce17eb9e104af3472fbdb121cd4453a34bad6088..e6b128dc1f9ba8b2a1e89fc22f58aabce284c862 100644
GIT binary patch
delta 2145
zcmcgs{Zmv`7(VCRyX@UvP(V~%cSS3O1wkc|WQIWTV+SM1b<5ci++hdWOwA^toG59=
zvN1E(H_VR|9Fxk#>3StUMvYNHN5{-YV<Lt7gJ?C=;4YD4CAWL_-m?q+0o@<&eV^x?
z^S<wMo_o%N7Ser^Z%E_1ZCK2h%Hw!ZG!iIF62KdiY;wC6EL%xmupy~b`aWhKj|seD
zaXc1}wC8ouzF5aiI{vmXApR+R9eeS;?R>H+cZW9I9C#;{e6kCATsEmaH-xua1k&3G
zW=jQ3<^*$eF<6BbQ}6C!s|xmwSXHnKj*eby?a~vo@`{dAc8TI798MagU{ykkd2^GN
zw2X(k+-XGlERvRrCinJ&Cuyy9;~s4m%lo;GFYb-xjZ$i}+oa}kmpHPx1y)(RO>`|s
z$mT;(GBJhUU0YZQ>n0|rx3!N<dRxbj&S|`$eNfi{Q5=P(cH43u55bi9@#OeXDSL`p
zFb~Bcl%&qO8wZOVgQK|Cq6;MoeH;q^5jfL*vD|pY6MrX61>giFiuk%3Mx<q^#N6@b
z6h`c%#Py8&dPWG-ec9ZR--0)E0u9J&y^#9if}vp0%gHv3Lm`=)hVIK|#FjNrUvFgb
z#7uuA-ZCtHI4t&OMdx&7`Lp%43Q~0_oWcj{G5x$KCt~k(nWQK&Du;u?uvq$PhjlYv
zHvS$K+6H%KMANxvM&r(zJ`1^ZtS&q+y$y0_`QrFf+fuJ1nXXJj@Wm{DQMh<o14aY&
zR4PVl8xAYFuMmZ=@?uq}kRY2d?O~f2vsOKdBLx*O(Mz(URZk6z9ZyF2ox@_|Y_*e3
z``zA1C$+QvS$ZeE3g3VS2IvlajDsO%fl?ysg;0U)iR`-Qu))lnxYTQCW0Vam`w$tu
zsJT$CpWH6HbT<a!wH#j@x!d#t)vlx~dn(~hj^FqzMUKb8J!gKJasR!{^{3FHt=|06
zv)(w%7dLd-eP8y^sXHe;>&?dlc}#ET9RF0-(s4Nvp%e1ctS>Z<b(0#vFvM9+HRsiz
zNPT{x=ih!&KXQLzVm}Y3=T?vT?@5S7ey|rz!1JIqF9)xL`aCO?b1Cpm-U?E6307BU
zCH7s>QWk0-w5D4+TpdFa-M2L&9%)yUp$AsySIlqg*JyU2Z|nF`P~+LzE59&u-n%+J
z*s0!UW|p+7Uy3a_LP+LSI6ZHRcEXG2J4xe>fH=vVrlmlAKTyPO%D$@<E!W2u-lC{b
zM;%=OaffudXe$oqk~|BKX%TpeH%U7dC+o<|O^~iQKVY+pKaKKm#p#o3pBX;$tCBZI
zjMu`+(hZijpS7Y52tlUPOANixRHoljhg?oDKNn9*uG8+4_3rjwqloR$&C3)y^|A7w
zD0)gqnLnyJBD>`7ffY;7l8#QWxhmniB}S5S4>r5BS_clfFlp_P4lkRAxsC}~y6Mgo
zxL2)MGE^7@b9CP!srq?R6QZV%864CK73%fg;<40PZ6IT+jGD2`ps@mmHTfkLhHKOU
z_Lo`-$$v1?v4cajf9BZWKNK;?1|O)%!W?tQ;DBhiu+lfN3LF0?&pHg6Jl!*HtO-MN
z*(B}9W2Tk=O`B(?wLYYXnb!9QmBLJ0!-b_V*YXjS64|RNb??fTo+0)S^Nm}WfZ=_Y
hR*xFToe{8f=IyDN+pQWFc22bE&P7j_^hAS;`xks92)6(L

delta 56
zcmcb$ljZv|rU@F%<&zmUYOAtrK0aB1X>tOa#AF3-zsdVVxHey4o5uoTOs?Qo*!+P_
LfpPN=p8ahATpbkx