persistence all to one test file, use more regular values like 2.0 for persistence tests

freqtrade/persistence/migrations.py

@@ -151,8 +151,6 @@ def migrate_orders_table(decl_base, inspector, engine, table_back_name: str, col
     decl_base.metadata.create_all(engine)
     leverage = get_column_def(cols, 'leverage', '1.0')
     # sqlite does not support literals for booleans
-    is_short = get_column_def(cols, 'is_short', '0')
-    # TODO-mg: Should liquidation price go in here?
     with engine.begin() as connection:
         connection.execute(text(f"""
             insert into orders ( id, ft_trade_id, ft_order_side, ft_pair, ft_is_open, order_id,

freqtrade/persistence/models.py

@@ -236,7 +236,7 @@ class LocalTrade():
     close_rate_requested: Optional[float] = None
     close_profit: Optional[float] = None
     close_profit_abs: Optional[float] = None
-    stake_amount: float = 0.0
+    stake_amount: float = 0.0  # TODO: This should probably be computed
     amount: float = 0.0
     amount_requested: Optional[float] = None
     open_date: datetime
@@ -273,7 +273,7 @@ class LocalTrade():
     @property
     def has_no_leverage(self) -> bool:
         """Returns true if this is a non-leverage, non-short trade"""
-        return (self.leverage == 1.0 and not self.is_short) or self.leverage is None
+        return ((self.leverage or self.leverage is None) == 1.0 and not self.is_short)
 
     @property
     def borrowed(self) -> float:
@@ -285,7 +285,7 @@ class LocalTrade():
         if self.has_no_leverage:
             return 0.0
         elif not self.is_short:
-            return self.stake_amount * (self.leverage-1)
+            return (self.amount * self.open_rate) * ((self.leverage-1)/self.leverage)
         else:
             return self.amount
 
@@ -351,6 +351,10 @@ class LocalTrade():
 
         self.liquidation_price = liquidation_price
 
+    def set_is_short(self, is_short: bool):
+        self.is_short = is_short
+        self.recalc_open_trade_value()
+
     def __repr__(self):
         open_since = self.open_date.strftime(DATETIME_PRINT_FORMAT) if self.is_open else 'closed'
 
@@ -635,7 +639,8 @@ class LocalTrade():
     def recalc_open_trade_value(self) -> None:
         """
         Recalculate open_trade_value.
-        Must be called whenever open_rate or fee_open is changed.
+        Must be called whenever open_rate, fee_open or is_short is changed.
+
         """
         self.open_trade_value = self._calc_open_trade_value()