Revert simulator with supervised

Drakkar-Software · May 1, 2020 · 7854073 · 7854073
1 parent faa2d29
commit 7854073
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 191 deletions.
diff --git a/octobot_trading/channels/exchange_channel.pxd b/octobot_trading/channels/exchange_channel.pxd
@@ -33,9 +33,6 @@ cdef class TimeFrameExchangeChannel(ExchangeChannel):
 cdef class ExchangeChannelConsumer(Consumer):
     pass
 
-cdef class ExchangeSimulatorChannelConsumer(SupervisedConsumer):
-    pass
-
 cdef class ExchangeChannelProducer(Producer):
     pass
 

diff --git a/octobot_trading/channels/exchange_channel.py b/octobot_trading/channels/exchange_channel.py
@@ -30,10 +30,6 @@ class ExchangeChannelConsumer(Consumer):
     pass
 
 
-class ExchangeSimulatorChannelConsumer(SupervisedConsumer):
-    pass
-
-
 class ExchangeChannelInternalConsumer(InternalConsumer):
     pass
 
@@ -49,8 +45,6 @@ class ExchangeChannelProducer(Producer):
 class ExchangeChannel(Channel):
     PRODUCER_CLASS = ExchangeChannelProducer
     CONSUMER_CLASS = ExchangeChannelConsumer
-    SIMULATOR_CONSUMER_CLASS = ExchangeSimulatorChannelConsumer
-
     CRYPTOCURRENCY_KEY = "cryptocurrency"
     SYMBOL_KEY = "symbol"
 
@@ -70,10 +64,7 @@ async def new_consumer(self,
                            symbol=CHANNEL_WILDCARD,
                            cryptocurrency=CHANNEL_WILDCARD,
                            **kwargs):
-        consumer = consumer_instance \
-            if consumer_instance else (self.CONSUMER_CLASS(callback, size=size)
-                                       if not self.exchange_manager.is_backtesting else
-                                       self.SIMULATOR_CONSUMER_CLASS(callback, size=size))
+        consumer = consumer_instance if consumer_instance else self.CONSUMER_CLASS(callback, size=size)
         await self._add_new_consumer_and_run(consumer,
                                              cryptocurrency=cryptocurrency,
                                              symbol=symbol,

diff --git a/octobot_trading/producers/simulator/balance_updater_simulator.pxd b/octobot_trading/producers/simulator/balance_updater_simulator.pxd
diff --git a/octobot_trading/producers/simulator/balance_updater_simulator.py b/octobot_trading/producers/simulator/balance_updater_simulator.py
diff --git a/octobot_trading/producers/simulator/funding_updater_simulator.py b/octobot_trading/producers/simulator/funding_updater_simulator.py
@@ -21,11 +21,3 @@ class FundingUpdaterSimulator(FundingUpdater):
     """
     The Funding Update Simulator fetch the exchange funding rate and send it to the Funding Channel
     """
-
-    async def before_update(self) -> (int, int):
-        """
-        Called to initialize funding update
-        :return: the next funding time and the sleep time
-        """
-        await self.wait_for_processing()
-        return await super(FundingUpdater, self).before_update()
diff --git a/octobot_trading/producers/simulator/kline_updater_simulator.py b/octobot_trading/producers/simulator/kline_updater_simulator.py
@@ -35,7 +35,6 @@ async def start(self):
 
     async def handle_timestamp(self, timestamp, **kwargs):
         try:
-            await self.wait_for_processing()
             for time_frame in self.channel.exchange_manager.exchange_config.traded_time_frames:
                 for pair in self.channel.exchange_manager.exchange_config.traded_symbol_pairs:
                     kline_data = await self.exchange_data_importer.get_kline_from_timestamps(

diff --git a/octobot_trading/producers/simulator/prices_updater_simulator.py b/octobot_trading/producers/simulator/prices_updater_simulator.py
@@ -35,21 +35,3 @@ async def start(self):
                 .new_consumer(self.handle_recent_trades_update)
         if real_data_for_ticker:
             await get_chan(TICKER_CHANNEL, self.channel.exchange_manager.id).new_consumer(self.handle_ticker_update)
-
-    async def handle_recent_trades_update(self, exchange: str, exchange_id: str,
-                                          cryptocurrency: str, symbol: str, recent_trades: list):
-        await self.wait_for_processing()
-        await super(MarkPriceUpdater, self).handle_recent_trades_update(exchange=exchange,
-                                                                        exchange_id=exchange_id,
-                                                                        cryptocurrency=cryptocurrency,
-                                                                        symbol=symbol,
-                                                                        recent_trades=recent_trades)
-
-    async def handle_ticker_update(self, exchange: str, exchange_id: str,
-                                   cryptocurrency: str, symbol: str, ticker: dict):
-        await self.wait_for_processing()
-        await super(MarkPriceUpdater, self).handle_ticker_update(exchange=exchange,
-                                                                 exchange_id=exchange_id,
-                                                                 cryptocurrency=cryptocurrency,
-                                                                 symbol=symbol,
-                                                                 ticker=ticker)
diff --git a/octobot_trading/producers/simulator/trades_updater_simulator.pxd b/octobot_trading/producers/simulator/trades_updater_simulator.pxd
diff --git a/octobot_trading/producers/simulator/trades_updater_simulator.py b/octobot_trading/producers/simulator/trades_updater_simulator.py
diff --git a/setup.py b/setup.py
@@ -57,7 +57,6 @@ def build_ext(*args, **kwargs):
                  "octobot_trading.producers.recent_trade_updater",
                  "octobot_trading.producers.ticker_updater",
                  "octobot_trading.producers.trades_updater",
-                 "octobot_trading.producers.simulator.balance_updater_simulator",
                  "octobot_trading.producers.simulator.funding_updater_simulator",
                  "octobot_trading.producers.simulator.ohlcv_updater_simulator",
                  "octobot_trading.producers.simulator.order_book_updater_simulator",
@@ -67,7 +66,6 @@ def build_ext(*args, **kwargs):
                  "octobot_trading.producers.simulator.prices_updater_simulator",
                  "octobot_trading.producers.simulator.recent_trade_updater_simulator",
                  "octobot_trading.producers.simulator.ticker_updater_simulator",
-                 "octobot_trading.producers.simulator.trades_updater_simulator",
                  "octobot_trading.data.book",
                  "octobot_trading.data.margin_portfolio",
                  "octobot_trading.data.order",