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

removed comment blocks and unused code

Browse Source
This commit is contained in:
creslinux 2018-07-19 18:13:19 +00:00
parent 236009ce7e
commit e54a5075be
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
freqtrade/freqtradebot.py
View File

@ -159,19 +159,6 @@ class FreqtradeBot(object):
for trade in trades: for trade in trades:
state_changed |= self.process_maybe_execute_sell(trade) state_changed |= self.process_maybe_execute_sell(trade)
# # todo Danny - add MP for sell process.
# # Added Parallel processing for process open trades.
# sell_output = mp.Queue()
# sell_processes = [mp.Process(target=self.process_maybe_execute_sell,
# args=(trade, sell_output)) for trade in trades]
#
# for p in sell_processes:
# time.sleep(0.2)
# p.start()
#
# for p in sell_processes:
# p.join()
# Then looking for buy opportunities # Then looking for buy opportunities
if len(trades) < self.config['max_open_trades']: if len(trades) < self.config['max_open_trades']:
state_changed = self.process_maybe_execute_buy() state_changed = self.process_maybe_execute_buy()
@ -365,7 +352,6 @@ class FreqtradeBot(object):
processes = [mp.Process(target=self.mp_pair, args=(_pair, interval, processes = [mp.Process(target=self.mp_pair, args=(_pair, interval,
stake_amount, output)) for _pair in whitelist] stake_amount, output)) for _pair in whitelist]
for p in processes: for p in processes:
#time.sleep(0.3)
p.start() p.start()
for p in processes: for p in processes:
@ -374,9 +360,7 @@ class FreqtradeBot(object):
# Add trade for pairs where buy and not sell # Add trade for pairs where buy and not sell
get_sig_results = [output.get() for p in processes] get_sig_results = [output.get() for p in processes]
for _pair, (buy, sell) in get_sig_results: for _pair, (buy, sell) in get_sig_results:
#print("buy, sell is", (buy, sell))
if buy and not sell: if buy and not sell:
#print(_pair, "buy and not sell")
self.execute_buy(_pair, stake_amount) self.execute_buy(_pair, stake_amount)
return False return False
@ -458,8 +442,6 @@ class FreqtradeBot(object):
logger.warning('Unable to create trade: %s', exception) logger.warning('Unable to create trade: %s', exception)
return False return False
#todo Danny - add sell to MP
#def process_maybe_execute_sell(self, trade: Trade, sell_output ) -> bool:
def process_maybe_execute_sell(self, trade: Trade) -> bool: def process_maybe_execute_sell(self, trade: Trade) -> bool:
""" """
Tries to execute a sell trade Tries to execute a sell trade
@ -485,15 +467,11 @@ class FreqtradeBot(object):
trade.update(order) trade.update(order)
if trade.is_open and trade.open_order_id is None: if trade.is_open and trade.open_order_id is None:
# Check if we can sell our current pair # Check if we can sell our current pai
# todo Danny Add result to MP queue sel_output
return self.handle_trade(trade) return self.handle_trade(trade)
#sell_output.put(self.handle_trade(trade))
except DependencyException as exception: except DependencyException as exception:
logger.warning('Unable to sell trade: %s', exception) logger.warning('Unable to sell trade: %s', exception)
# todo danny - Add to output sell queue and MP sells
#sell_output.put(False)
return False return False
def get_real_amount(self, trade: Trade, order: Dict) -> float: def get_real_amount(self, trade: Trade, order: Dict) -> float: