[Mod] complete test of QuoteApi

msincenselee · Jun 7, 2019 · 18b4162 · 18b4162
1 parent 260e270
commit 18b4162
Show file tree

Hide file tree

Showing 5 changed files with 377 additions and 217 deletions.
diff --git a/tests/trader/run.py b/tests/trader/run.py
@@ -1,31 +1,31 @@
-
 from vnpy.event import EventEngine
 
 from vnpy.trader.engine import MainEngine
 from vnpy.trader.ui import MainWindow, create_qapp
 
-from vnpy.gateway.bitmex import BitmexGateway
-from vnpy.gateway.futu import FutuGateway
-from vnpy.gateway.ib import IbGateway
-from vnpy.gateway.ctp import CtpGateway
-# from vnpy.gateway.ctptest import CtptestGateway
-from vnpy.gateway.femas import FemasGateway
-from vnpy.gateway.tiger import TigerGateway
-from vnpy.gateway.oes import OesGateway
-from vnpy.gateway.okex import OkexGateway
-from vnpy.gateway.huobi import HuobiGateway
-from vnpy.gateway.bitfinex import BitfinexGateway
-from vnpy.gateway.onetoken import OnetokenGateway
-from vnpy.gateway.okexf import OkexfGateway
-from vnpy.gateway.xtp import XtpGateway
-from vnpy.gateway.hbdm import HbdmGateway
+# from vnpy.gateway.bitmex import BitmexGateway
+# from vnpy.gateway.futu import FutuGateway
+# from vnpy.gateway.ib import IbGateway
+# from vnpy.gateway.ctp import CtpGateway
+# # from vnpy.gateway.ctptest import CtptestGateway
+# from vnpy.gateway.femas import FemasGateway
+# from vnpy.gateway.tiger import TigerGateway
+# from vnpy.gateway.oes import OesGateway
+# from vnpy.gateway.okex import OkexGateway
+# from vnpy.gateway.huobi import HuobiGateway
+# from vnpy.gateway.bitfinex import BitfinexGateway
+# from vnpy.gateway.onetoken import OnetokenGateway
+# from vnpy.gateway.okexf import OkexfGateway
+# from vnpy.gateway.xtp import XtpGateway
+# from vnpy.gateway.hbdm import HbdmGateway
+from vnpy.gateway.tap import TapGateway
 
-from vnpy.app.cta_strategy import CtaStrategyApp
-from vnpy.app.csv_loader import CsvLoaderApp
-from vnpy.app.algo_trading import AlgoTradingApp
-from vnpy.app.cta_backtester import CtaBacktesterApp
-from vnpy.app.data_recorder import DataRecorderApp
-from vnpy.app.risk_manager import RiskManagerApp
+# from vnpy.app.cta_strategy import CtaStrategyApp
+# from vnpy.app.csv_loader import CsvLoaderApp
+# from vnpy.app.algo_trading import AlgoTradingApp
+# from vnpy.app.cta_backtester import CtaBacktesterApp
+# from vnpy.app.data_recorder import DataRecorderApp
+# from vnpy.app.risk_manager import RiskManagerApp
 
 
 def main():
@@ -35,28 +35,29 @@ def main():
     event_engine = EventEngine()
 
     main_engine = MainEngine(event_engine)
-    main_engine.add_gateway(XtpGateway)
-    main_engine.add_gateway(CtpGateway)
-    # main_engine.add_gateway(CtptestGateway)
-    main_engine.add_gateway(FemasGateway)
-    main_engine.add_gateway(IbGateway)
-    main_engine.add_gateway(FutuGateway)
-    main_engine.add_gateway(BitmexGateway)
-    main_engine.add_gateway(TigerGateway)
-    main_engine.add_gateway(OesGateway)
-    main_engine.add_gateway(OkexGateway)
-    main_engine.add_gateway(HuobiGateway)
-    main_engine.add_gateway(BitfinexGateway)
-    main_engine.add_gateway(OnetokenGateway)
-    main_engine.add_gateway(OkexfGateway)
-    main_engine.add_gateway(HbdmGateway)
+    # main_engine.add_gateway(XtpGateway)
+    # main_engine.add_gateway(CtpGateway)
+    # # main_engine.add_gateway(CtptestGateway)
+    # main_engine.add_gateway(FemasGateway)
+    # main_engine.add_gateway(IbGateway)
+    # main_engine.add_gateway(FutuGateway)
+    # main_engine.add_gateway(BitmexGateway)
+    # main_engine.add_gateway(TigerGateway)
+    # main_engine.add_gateway(OesGateway)
+    # main_engine.add_gateway(OkexGateway)
+    # main_engine.add_gateway(HuobiGateway)
+    # main_engine.add_gateway(BitfinexGateway)
+    # main_engine.add_gateway(OnetokenGateway)
+    # main_engine.add_gateway(OkexfGateway)
+    # main_engine.add_gateway(HbdmGateway)
+    main_engine.add_gateway(TapGateway)
 
-    main_engine.add_app(CtaStrategyApp)
-    main_engine.add_app(CtaBacktesterApp)
-    main_engine.add_app(CsvLoaderApp)
-    main_engine.add_app(AlgoTradingApp)
-    main_engine.add_app(DataRecorderApp)
-    main_engine.add_app(RiskManagerApp)
+    # main_engine.add_app(CtaStrategyApp)
+    # main_engine.add_app(CtaBacktesterApp)
+    # main_engine.add_app(CsvLoaderApp)
+    # main_engine.add_app(AlgoTradingApp)
+    # main_engine.add_app(DataRecorderApp)
+    # main_engine.add_app(RiskManagerApp)
 
     main_window = MainWindow(main_engine, event_engine)
     main_window.showMaximized()

diff --git a/vnpy/api/itap/vnitap.lib b/vnpy/api/itap/vnitap.lib
diff --git a/vnpy/api/tap/__init__.py b/vnpy/api/tap/__init__.py
diff --git a/vnpy/gateway/ctp/ctp_gateway.py b/vnpy/gateway/ctp/ctp_gateway.py
@@ -138,7 +138,7 @@ class CtpGateway(BaseGateway):
 
     def __init__(self, event_engine):
         """Constructor"""
-        super(CtpGateway, self).__init__(event_engine, "CTP")
+        super().__init__(event_engine, "CTP")
 
         self.td_api = CtpTdApi(self)
         self.md_api = CtpMdApi(self)