Merge branch 'freqtrade:develop' into feat_bt_cancel_entry_reporting

tests/data/test_history.py

@@ -158,21 +158,22 @@ def test_testdata_path(testdatadir) -> None:
     assert str(Path('tests') / 'testdata') in str(testdatadir)
 
 
-@pytest.mark.parametrize("pair,expected_result,candle_type", [
-    ("ETH/BTC", 'freqtrade/hello/world/ETH_BTC-5m.json', ""),
-    ("Fabric Token/ETH", 'freqtrade/hello/world/Fabric_Token_ETH-5m.json', ""),
-    ("ETHH20", 'freqtrade/hello/world/ETHH20-5m.json', ""),
-    (".XBTBON2H", 'freqtrade/hello/world/_XBTBON2H-5m.json', ""),
-    ("ETHUSD.d", 'freqtrade/hello/world/ETHUSD_d-5m.json', ""),
-    ("ACC_OLD/BTC", 'freqtrade/hello/world/ACC_OLD_BTC-5m.json', ""),
-    ("ETH/BTC", 'freqtrade/hello/world/futures/ETH_BTC-5m-mark.json', "mark"),
-    ("ACC_OLD/BTC", 'freqtrade/hello/world/futures/ACC_OLD_BTC-5m-index.json', "index"),
+@pytest.mark.parametrize("pair,timeframe,expected_result,candle_type", [
+    ("ETH/BTC", "5m", "freqtrade/hello/world/ETH_BTC-5m.json", ""),
+    ("ETH/USDT", "1M", "freqtrade/hello/world/ETH_USDT-1Mo.json", ""),
+    ("Fabric Token/ETH", "5m", "freqtrade/hello/world/Fabric_Token_ETH-5m.json", ""),
+    ("ETHH20", "5m", "freqtrade/hello/world/ETHH20-5m.json", ""),
+    (".XBTBON2H", "5m", "freqtrade/hello/world/_XBTBON2H-5m.json", ""),
+    ("ETHUSD.d", "5m", "freqtrade/hello/world/ETHUSD_d-5m.json", ""),
+    ("ACC_OLD/BTC", "5m", "freqtrade/hello/world/ACC_OLD_BTC-5m.json", ""),
+    ("ETH/BTC", "5m", "freqtrade/hello/world/futures/ETH_BTC-5m-mark.json", "mark"),
+    ("ACC_OLD/BTC", "5m", "freqtrade/hello/world/futures/ACC_OLD_BTC-5m-index.json", "index"),
 ])
-def test_json_pair_data_filename(pair, expected_result, candle_type):
+def test_json_pair_data_filename(pair, timeframe, expected_result, candle_type):
     fn = JsonDataHandler._pair_data_filename(
         Path('freqtrade/hello/world'),
         pair,
-        '5m',
+        timeframe,
         CandleType.from_string(candle_type)
     )
     assert isinstance(fn, Path)
@@ -180,7 +181,7 @@ def test_json_pair_data_filename(pair, expected_result, candle_type):
     fn = JsonGzDataHandler._pair_data_filename(
         Path('freqtrade/hello/world'),
         pair,
-        '5m',
+        timeframe,
         candle_type=CandleType.from_string(candle_type)
     )
     assert isinstance(fn, Path)

tests/exchange/test_ccxt_precise.py

@@ -0,0 +1,75 @@
+from ccxt import Precise
+
+
+ws = Precise('-1.123e-6')
+ws = Precise('-1.123e-6')
+xs = Precise('0.00000002')
+ys = Precise('69696900000')
+zs = Precise('0')
+
+
+def test_precise():
+    assert ys * xs == '1393.938'
+    assert xs * ys == '1393.938'
+
+    assert ys + xs == '69696900000.00000002'
+    assert xs + ys == '69696900000.00000002'
+    assert xs - ys == '-69696899999.99999998'
+    assert ys - xs == '69696899999.99999998'
+    assert xs / ys == '0'
+    assert ys / xs == '3484845000000000000'
+
+    assert ws * xs == '-0.00000000000002246'
+    assert xs * ws == '-0.00000000000002246'
+
+    assert ws + xs == '-0.000001103'
+    assert xs + ws == '-0.000001103'
+
+    assert xs - ws == '0.000001143'
+    assert ws - xs == '-0.000001143'
+
+    assert xs / ws == '-0.017809439002671415'
+    assert ws / xs == '-56.15'
+
+    assert zs * ws == '0'
+    assert zs * xs == '0'
+    assert zs * ys == '0'
+    assert ws * zs == '0'
+    assert xs * zs == '0'
+    assert ys * zs == '0'
+
+    assert zs + ws == '-0.000001123'
+    assert zs + xs == '0.00000002'
+    assert zs + ys == '69696900000'
+    assert ws + zs == '-0.000001123'
+    assert xs + zs == '0.00000002'
+    assert ys + zs == '69696900000'
+
+    assert abs(Precise('-500.1')) == '500.1'
+    assert abs(Precise('213')) == '213'
+
+    assert abs(Precise('-500.1')) == '500.1'
+    assert -Precise('213') == '-213'
+
+    assert Precise('10.1') % Precise('0.5') == '0.1'
+    assert Precise('5550') % Precise('120') == '30'
+
+    assert Precise('-0.0') == Precise('0')
+    assert Precise('5.534000') == Precise('5.5340')
+
+    assert min(Precise('-3.1415'), Precise('-2')) == '-3.1415'
+
+    assert max(Precise('3.1415'), Precise('-2')) == '3.1415'
+
+    assert Precise('2') > Precise('1.2345')
+    assert not Precise('-3.1415') > Precise('-2')
+    assert not Precise('3.1415') > Precise('3.1415')
+    assert Precise.string_gt('3.14150000000000000000001', '3.1415')
+
+    assert Precise('3.1415') >= Precise('3.1415')
+    assert Precise('3.14150000000000000000001') >= Precise('3.1415')
+
+    assert not Precise('3.1415') < Precise('3.1415')
+
+    assert Precise('3.1415') <= Precise('3.1415')
+    assert Precise('3.1415') <= Precise('3.14150000000000000000001')

tests/exchange/test_exchange.py

@@ -305,6 +305,7 @@ def test_amount_to_precision(
     (234.53, 4, 0.5, 235.0),
     (0.891534, 4, 0.0001, 0.8916),
     (64968.89, 4, 0.01, 64968.89),
+    (0.000000003483, 4, 1e-12, 0.000000003483),
 
 ])
 def test_price_to_precision(default_conf, mocker, price, precision_mode, precision, expected):