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

unused library + trailing whitespaces removed.

Browse Source
This commit is contained in:
misagh 2018-09-26 16:36:41 +02:00
parent abb398786e
commit 75ba6578a3
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/freqtradebot.py
View File

@ -404,7 +404,12 @@ class FreqtradeBot(object):
stake_amount = self._get_trade_stake_amount(_pair) stake_amount = self._get_trade_stake_amount(_pair)
if not stake_amount: if not stake_amount:
return False return False
logger.info('Buy signal found: about create a new trade with stake_amount: %f ...', stake_amount)
logger.info(
'Buy signal found: about create a new trade with stake_amount: %f ...',
stake_amount
)
bidstrat_check_depth_of_market = self.config.get('bid_strategy', {}).\ bidstrat_check_depth_of_market = self.config.get('bid_strategy', {}).\
get('check_depth_of_market', {}) get('check_depth_of_market', {})
if (bidstrat_check_depth_of_market.get('enabled', False)) and\ if (bidstrat_check_depth_of_market.get('enabled', False)) and\
@ -444,10 +449,10 @@ class FreqtradeBot(object):
pair_url = self.exchange.get_pair_detail_url(pair) pair_url = self.exchange.get_pair_detail_url(pair)
stake_currency = self.config['stake_currency'] stake_currency = self.config['stake_currency']
fiat_currency = self.config.get('fiat_display_currency', None) fiat_currency = self.config.get('fiat_display_currency', None)
# Calculate amount # Calculate amount
buy_limit = self.get_target_bid(pair, self.exchange.get_ticker(pair)) buy_limit = self.get_target_bid(pair, self.exchange.get_ticker(pair))
min_stake_amount = self._get_min_pair_stake_amount(pair_s, buy_limit) min_stake_amount = self._get_min_pair_stake_amount(pair_s, buy_limit)
if min_stake_amount is not None and min_stake_amount > stake_amount: if min_stake_amount is not None and min_stake_amount > stake_amount:
logger.warning( logger.warning(
@ -630,9 +635,11 @@ class FreqtradeBot(object):
def check_sell(self, trade: Trade, sell_rate: float, buy: bool, sell: bool) -> bool: def check_sell(self, trade: Trade, sell_rate: float, buy: bool, sell: bool) -> bool:
if (self.config['edge']['enabled']): if (self.config['edge']['enabled']):
stoploss = self.edge.stoploss(trade.pair) stoploss = self.edge.stoploss(trade.pair)
should_sell = self.strategy.should_sell(trade, sell_rate, datetime.utcnow(), buy, sell, stoploss) should_sell = \
self.strategy.should_sell(trade, sell_rate, datetime.utcnow(), buy, sell, stoploss)
else: else:
should_sell = self.strategy.should_sell(trade, sell_rate, datetime.utcnow(), buy, sell) should_sell = \
self.strategy.should_sell(trade, sell_rate, datetime.utcnow(), buy, sell)
if should_sell.sell_flag: if should_sell.sell_flag:
self.execute_sell(trade, sell_rate, should_sell.sell_type) self.execute_sell(trade, sell_rate, should_sell.sell_type)

1
freqtrade/optimize/__init__.py
View File

@ -16,7 +16,6 @@ import arrow
from freqtrade import misc, constants, OperationalException from freqtrade import misc, constants, OperationalException
from freqtrade.exchange import Exchange from freqtrade.exchange import Exchange
from freqtrade.arguments import TimeRange from freqtrade.arguments import TimeRange
import importlib
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

6
freqtrade/strategy/interface.py
View File

@ -210,8 +210,10 @@ class IStrategy(ABC):
:return: True if trade should be sold, False otherwise :return: True if trade should be sold, False otherwise
""" """
current_profit = trade.calc_profit_percent(rate) current_profit = trade.calc_profit_percent(rate)
stoplossflag = self.stop_loss_reached(current_rate=rate, trade=trade, current_time=date, stoplossflag = \
current_profit=current_profit, force_stoploss=force_stoploss) self.stop_loss_reached(current_rate=rate, trade=trade, current_time=date,
current_profit=current_profit, force_stoploss=force_stoploss)
if stoplossflag.sell_flag: if stoplossflag.sell_flag:
return stoplossflag return stoplossflag

2
freqtrade/tests/conftest.py
View File

@ -137,7 +137,7 @@ def default_conf():
"stoploss_range_min": -0.01, "stoploss_range_min": -0.01,
"stoploss_range_max": -0.1, "stoploss_range_max": -0.1,
"stoploss_range_step": -0.001, "stoploss_range_step": -0.001,
"maximum_winrate": 0.80, "maximum_winrate": 0.80,
"min_trade_number": 15, "min_trade_number": 15,
"max_trade_duration_minute": 1440, "max_trade_duration_minute": 1440,
"remove_pumps": True, "remove_pumps": True,