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

updated unit tests

Browse Source
This commit is contained in:
Kavinkumar
2022-03-03 20:51:13 +05:30
parent f67b1b4fcf
commit 42be492404
6 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/freqtradebot.py
View File

@@ -629,7 +629,10 @@ class FreqtradeBot(LoggingMixin):
trade.open_order_id = order_id
trade.orders.append(order_obj)
trade.recalc_trade_from_orders()
if pos_adjust:
trade.recalc_trade_from_orders()
else:
trade.recalc_open_trade_value()
Trade.query.session.add(trade)
Trade.commit()
@@ -1500,7 +1503,7 @@ class FreqtradeBot(LoggingMixin):
return order_amount
return self.fee_detection_from_trades(trade, order, order_amount, order.get('trades', []))
rpc_msg:Dict[Any, Any] = {}
rpc_msg: Dict[Any, Any] = {}
def fee_detection_from_trades(self, trade: Trade, order: Dict, order_amount: float,
trades: List) -> float:

8
freqtrade/optimize/backtesting1.py
View File

@@ -480,8 +480,10 @@ class Backtesting:
return self._exit_trade(trade, sell_row, closerate)
def _exit_trade(self, trade: LocalTrade,sell_row: Tuple,
closerate: float, amount: float = None) -> Optional[LocalTrade]:
return None
def _exit_trade(self, trade: LocalTrade, sell_row: Tuple,
closerate: float, amount: float = None) -> Optional[LocalTrade]:
self.order_id_counter += 1
# mdebug
if amount:
@@ -821,7 +823,7 @@ class Backtesting:
# mdebug
logger.info(f'822 {order.safe_amount_after_fee} != {trade.amount}')
order.close_bt_order(current_time)
trade.process_sell_sub_trade(order, is_non_bt = False)
trade.process_sell_sub_trade(order, is_non_bt=False)
trade.recalc_trade_from_orders()
else:
trade.close_date = current_time

22
freqtrade/persistence/models.py
View File

@@ -516,7 +516,8 @@ class LocalTrade():
raise ValueError(f'Unknown order type: {order.order_type}')
Trade.commit()
def process_sell_sub_trade(self, order: Order, is_closed: bool = True, is_non_bt: bool = True) -> None:
def process_sell_sub_trade(self, order: Order, is_closed: bool = True,
is_non_bt: bool = True) -> None:
orders = (self.select_filled_orders('buy'))
sell_amount = order.safe_filled
sell_rate = order.safe_price
@@ -524,7 +525,8 @@ class LocalTrade():
if is_closed:
if sell_amount == self.amount:
self.close(sell_rate)
if is_non_bt: Trade.commit()
if is_non_bt:
Trade.commit()
return
profit = 0.0
idx = -1
@@ -547,12 +549,14 @@ class LocalTrade():
amount2 = b_order2.safe_amount_after_fee
b_order2.average = (b_order2.average * amount2 - profit / (1 + self.fee_open)) / amount2
b_order2.order_update_date = datetime.now(timezone.utc)
if is_non_bt: Order.query.session.commit()
if is_non_bt:
Order.query.session.commit()
self.recalc_trade_from_orders()
self.close_profit_abs = profit
self.close_profit = sell_stake_amount / (sell_stake_amount - profit) - 1
if is_non_bt: Trade.commit()
if is_non_bt:
Trade.commit()
def calc_profit2(self, open_rate: float, close_rate: float,
amount: float) -> float:
@@ -692,14 +696,6 @@ class LocalTrade():
return float(f"{profit_ratio:.8f}")
def recalc_trade_from_orders(self):
# mdebug
import json
# logger.info(json.dumps(self.to_json(), indent =4))
if len(self.select_filled_orders('buy')) < 2 and 0:
# Just in case, still recalc open trade value
# needs to remove
self.recalc_open_trade_value()
return
total_amount = 0.0
total_stake = 0.0
for o in self.orders:
@@ -723,8 +719,6 @@ class LocalTrade():
self.recalc_open_trade_value()
if self.stop_loss_pct is not None and self.open_rate is not None:
self.adjust_stop_loss(self.open_rate, self.stop_loss_pct)
# logger.info(json.dumps(self.to_json(), indent =4))
# mdebug
def select_order_by_order_id(self, order_id: str) -> Optional[Order]:
"""