core/exchanges/common.py

@@ -16,9 +16,3 @@ def get_balance_hook(user_id, user_name, account_id, account_name, balance):
             "balance": balance,
         },
     )
-
-
-def convert_open_trades(open_trades):
-    """
-    Convert a list of open trades into a list of Trade-like objects.
-    """

core/exchanges/oanda.py

@@ -151,17 +151,10 @@ class OANDAExchange(BaseExchange):
         return response
 
     def close_all_positions(self):
-        all_positions = self.get_all_positions()
+        # all_positions = self.get_all_positions()
-        responses = []
+
-        for position in all_positions:
+        # for position in all_positions["itemlist"]:
-            side = position["side"]
+        #     print("POS ITER", position)
-            symbol = position["symbol"]
+        r = positions.PositionClose(accountID=self.account_id)
-            data = {
-                f"{side}Units": "ALL",
-            }
-            r = positions.PositionClose(
-                accountID=self.account_id, instrument=symbol, data=data
-            )
         response = self.call(r)
-            responses.append(response)
+        return response
-        return responses

core/tests/helpers.py

@@ -32,11 +32,6 @@ class ElasticMock:
 
 
 class LiveBase:
-    @classmethod
-    def tearDownClass(cls):
-        cls.account.client.close_all_positions()
-        super(LiveBase, cls).tearDownClass()
-
     @classmethod
     def setUpClass(cls):
         super(LiveBase, cls).setUpClass()

core/tests/trading/test_live.py

@@ -78,8 +78,3 @@ class LiveTradingTestCase(ElasticMock, LiveBase, TestCase):
 
         if not found:
             self.fail("Could not find the trade in the list of open trades")
-
-    def test_convert_open_trades(self):
-        """
-        Test converting open trades response to Trade-like format.
-        """