updated unit tests

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

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]:
"""