X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=055967cd355a0c05c37bdd64e2e6c4f494949073;hb=445b4a7712fb7fe45e17b6b76356dd3be42dd900;hp=78ced1a209eea10c181dfd429b238ff7ca30c659;hpb=b4e0ba0b0aa84550d0b06338b59557c3050798c9;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/market.py b/market.py
index 78ced1a..055967c 100644
--- a/market.py
+++ b/market.py
@@ -14,9 +14,7 @@ class Market:
     trades = None
     balances = None
 
-    def __init__(self, ccxt_instance, args,
-            user_id=None, market_id=None,
-            report_path=None, pg_config=None):
+    def __init__(self, ccxt_instance, args, **kwargs):
         self.args = args
         self.debug = args.debug
         self.ccxt = ccxt_instance
@@ -26,33 +24,16 @@ class Market:
         self.balances = BalanceStore(self)
         self.processor = Processor(self)
 
-        self.user_id = user_id
-        self.market_id = market_id
-        self.report_path = report_path
-        self.pg_config = pg_config
+        for key in ["user_id", "market_id", "report_path", "pg_config"]:
+            setattr(self, key, kwargs.get(key, None))
 
     @classmethod
-    def from_config(cls, config, args,
-            user_id=None, market_id=None, report_path=None, pg_config=None):
+    def from_config(cls, config, args, **kwargs):
         config["apiKey"] = config.pop("key", None)
 
         ccxt_instance = ccxt.poloniexE(config)
 
-        # For requests logging
-        ccxt_instance.session.origin_request = ccxt_instance.session.request
-        ccxt_instance.session._parent = ccxt_instance
-
-        def request_wrap(self, *args, **kwargs):
-            r = self.origin_request(*args, **kwargs)
-            self._parent._market.report.log_http_request(args[0],
-                    args[1], kwargs["data"], kwargs["headers"], r)
-            return r
-        ccxt_instance.session.request = request_wrap.__get__(ccxt_instance.session,
-                ccxt_instance.session.__class__)
-
-        return cls(ccxt_instance, args,
-                user_id=user_id, market_id=market_id,
-                pg_config=pg_config, report_path=report_path)
+        return cls(ccxt_instance, args, **kwargs)
 
     def store_report(self):
         self.report.merge(Portfolio.report)