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

Merge pull request #1346 from mishaker/fix_python_beginner_mistake

Browse Source 
Refactoring a bit ...
This commit is contained in:
Matthias
2018-11-22 06:02:15 +01:00
committed by GitHub
parent 8e62fc1c03 eb53281434
commit 1810fc9efa
3 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
freqtrade/tests/edge/test_edge.py
View File

@@ -4,7 +4,7 @@
import pytest
import logging
from freqtrade.tests.conftest import get_patched_freqtradebot
from freqtrade.edge import Edge
from freqtrade.edge import Edge, PairInfo
from pandas import DataFrame, to_datetime
from freqtrade.strategy.interface import SellType
from freqtrade.tests.optimize import (BTrade, BTContainer, _build_backtest_dataframe,
@@ -128,9 +128,9 @@ def test_adjust(mocker, default_conf):
edge = Edge(default_conf, freqtrade.exchange, freqtrade.strategy)
mocker.patch('freqtrade.edge.Edge._cached_pairs', mocker.PropertyMock(
return_value={
'E/F': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'C/D': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'N/O': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60)
'E/F': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'C/D': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'N/O': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60)
}
))
@@ -143,9 +143,9 @@ def test_stoploss(mocker, default_conf):
edge = Edge(default_conf, freqtrade.exchange, freqtrade.strategy)
mocker.patch('freqtrade.edge.Edge._cached_pairs', mocker.PropertyMock(
return_value={
'E/F': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'C/D': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'N/O': Edge._pair_info(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60)
'E/F': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'C/D': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60),
'N/O': PairInfo(-0.01, 0.66, 3.71, 0.50, 1.71, 10, 60)
}
))

13
freqtrade/tests/optimize/test_edge_cli.py
View File

@@ -4,7 +4,7 @@
from unittest.mock import MagicMock
import json
from typing import List
from freqtrade.edge import Edge
from freqtrade.edge import PairInfo
from freqtrade.arguments import Arguments
from freqtrade.optimize.edge_cli import (EdgeCli, setup_configuration, start)
from freqtrade.tests.conftest import log_has, patch_exchange
@@ -123,17 +123,8 @@ def test_generate_edge_table(edge_conf, mocker):
edge_cli = EdgeCli(edge_conf)
results = {}
info = {
'stoploss': -0.01,
'winrate': 0.60,
'risk_reward_ratio': 2,
'required_risk_reward': 1,
'expectancy': 3,
'nb_trades': 10,
'avg_trade_duration': 60
}
results['ETH/BTC'] = PairInfo(-0.01, 0.60, 2, 1, 3, 10, 60)
results['ETH/BTC'] = Edge._pair_info(**info)
assert edge_cli._generate_edge_table(results).count(':|') == 7
assert edge_cli._generate_edge_table(results).count('| ETH/BTC |') == 1
assert edge_cli._generate_edge_table(results).count(