add logic to .closed (just in case)

betcode-org · Jul 17, 2020 · 6a8d3ae · 6a8d3ae
1 parent 27a137a
commit 6a8d3ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/flumine/baseflumine.py b/flumine/baseflumine.py
@@ -229,7 +229,7 @@ def _process_close_market(self, event: events.CloseMarketEvent) -> None:
         closed_markets = [
             m
             for m in self.markets
-            if m.elapsed_seconds_closed and m.elapsed_seconds_closed > 3600
+            if m.closed and m.elapsed_seconds_closed and m.elapsed_seconds_closed > 3600
         ]
         for market in closed_markets:
             self._remove_market(market)

diff --git a/tests/test_baseflumine.py b/tests/test_baseflumine.py
@@ -191,7 +191,7 @@ def test__process_close_market(self, mock_log_control, mock_info):
         mock_strategy = mock.Mock()
         mock_strategy.stream_ids = [1, 2, 3]
         self.base_flumine.strategies = [mock_strategy]
-        mock_market = mock.Mock(elapsed_seconds_closed=None)
+        mock_market = mock.Mock(closed=False, elapsed_seconds_closed=None)
         mock_market.market_book.streaming_unique_id = 2
         self.base_flumine.markets._markets = {"1.23": mock_market}
         mock_event = mock.Mock()
@@ -210,7 +210,7 @@ def test__process_close_market(self, mock_log_control, mock_info):
 
     @mock.patch("flumine.baseflumine.BaseFlumine.info")
     def test__process_close_market_no_market(self, mock_info):
-        mock_market = mock.Mock(elapsed_seconds_closed=None)
+        mock_market = mock.Mock(closed=False, elapsed_seconds_closed=None)
         mock_market.market_book.streaming_unique_id = 2
         self.base_flumine.markets._markets = {"1.23": mock_market}
         mock_event = mock.Mock()
@@ -225,19 +225,24 @@ def test__process_close_market_closed(self, mock_log_control, mock_info):
         mock_strategy = mock.Mock()
         mock_strategy.stream_ids = [1, 2, 3]
         self.base_flumine.strategies = [mock_strategy]
-        mock_market = mock.Mock(elapsed_seconds_closed=None)
+        mock_market = mock.Mock(closed=False, elapsed_seconds_closed=None)
         mock_market.market_book.streaming_unique_id = 2
         self.base_flumine.markets._markets = {
             "1.23": mock_market,
-            "4.56": mock.Mock(market_id="4.56", elapsed_seconds_closed=25),
-            "7.89": mock.Mock(market_id="7.89", elapsed_seconds_closed=3601),
+            "4.56": mock.Mock(market_id="4.56", closed=True, elapsed_seconds_closed=25),
+            "7.89": mock.Mock(
+                market_id="7.89", closed=True, elapsed_seconds_closed=3601
+            ),
+            "1.01": mock.Mock(
+                market_id="1.01", closed=False, elapsed_seconds_closed=3601
+            ),
         }
         mock_event = mock.Mock()
         mock_market_book = mock.Mock(market_id="1.23")
         mock_event.event = mock_market_book
         self.base_flumine._process_close_market(mock_event)
 
-        self.assertEqual(len(self.base_flumine.markets._markets), 2)
+        self.assertEqual(len(self.base_flumine.markets._markets), 3)
 
     @mock.patch("flumine.baseflumine.events")
     @mock.patch("flumine.baseflumine.BaseFlumine.log_control")