ran isort .

TODO

@@ -1,32 +0,0 @@
-List of things TODO to add margin trading
-
-margin-db
-    profit ratio calculation
-    move leverage and is_short out of Trade = and into conftest
-    initial stop_loss with liquidation price maybe
-
-Files to edit
-    freqtrade/freqtradebot.py
-    freqtrade/wallets.py
-    freqtrade/data/btanalysis.py
-    configuration
-    freqtrade/commands/deploy_commands.py
-    freqtrade/commands/arguments.py
-    freqtrade/strategy
-    freqtrade/constants.py
-
-later
-    freqtrade/commands/build_config_commands.py
-    freqtrade/commands/cli_options.py
-    freqtrade/commands/list_commands.py
-    freqtrade/commands/hyperopt_commands.py
-    config_binance.json.example
-    config_kraken.json.example
-    freqtrade/enums/selltype.py
-
-Did not look at these files
-    freqtrade/plot/plotting.py
-    freqtrade/plugins
-    freqtrade/resolvers/strategy_resolver.py
-    freqtrade/rpc
-

freqtrade/enums/interestmode.py

@@ -1,7 +1,9 @@
-from enum import Enum
 from decimal import Decimal
+from enum import Enum
+
 from freqtrade.exceptions import OperationalException
 
+
 one = Decimal(1.0)
 four = Decimal(4.0)
 twenty_four = Decimal(24.0)

freqtrade/persistence/models.py

@@ -302,7 +302,6 @@ class LocalTrade():
         # Stoploss would be better as a computed variable,
         # but that messes up the database so it might not be possible
 
-        assert stop_loss or liquidation_price  # programming error check
         if liquidation_price is not None:
             if stop_loss is not None:
                 if self.is_short:
@@ -314,10 +313,11 @@ class LocalTrade():
                 self.initial_stop_loss = liquidation_price
             self.liquidation_price = liquidation_price
         else:
-            if stop_loss:  # Will always be true, here for mypy
+            # programmming error check: 1 of liqudication_price or stop_loss must be set
-                if not self.stop_loss:
+            assert stop_loss is not None
-                    self.initial_stop_loss = stop_loss
+            if not self.stop_loss:
-                self.stop_loss = stop_loss
+                self.initial_stop_loss = stop_loss
+            self.stop_loss = stop_loss
 
     def set_stop_loss(self, stop_loss: float):
         self.set_stop_loss_helper(stop_loss=stop_loss, liquidation_price=self.liquidation_price)

tests/conftest.py

@@ -23,8 +23,8 @@ from freqtrade.freqtradebot import FreqtradeBot
 from freqtrade.persistence import LocalTrade, Trade, init_db
 from freqtrade.resolvers import ExchangeResolver
 from freqtrade.worker import Worker
-from tests.conftest_trades import (mock_trade_1, mock_trade_2, mock_trade_3, mock_trade_4,
+from tests.conftest_trades import (leverage_trade, mock_trade_1, mock_trade_2, mock_trade_3,
-                                   mock_trade_5, mock_trade_6, short_trade, leverage_trade)
+                                   mock_trade_4, mock_trade_5, mock_trade_6, short_trade)
 
 
 logging.getLogger('').setLevel(logging.INFO)

tests/persistence/test_persistence_leverage.py

@@ -1,6 +1,8 @@
 from datetime import datetime, timedelta
-import pytest
 from math import isclose
+
+import pytest
+
 from freqtrade.enums import InterestMode
 from freqtrade.persistence import Trade
 from tests.conftest import log_has_re

tests/persistence/test_persistence_short.py

@@ -1,7 +1,9 @@
 from datetime import datetime, timedelta
+from math import isclose
+
 import arrow
 import pytest
-from math import isclose
+
 from freqtrade.enums import InterestMode
 from freqtrade.persistence import Trade, init_db
 from tests.conftest import create_mock_trades_with_leverage, log_has_re