1 files changed, 12 insertions, 19 deletions

diff --git a/market.py b/market.py
index 08838a7..224cc32 100644
--- a/market.py
+++ b/market.py
@@ -1,24 +1,17 @@
 import ccxt_wrapper as ccxt
+from store import ReportStore
 
-market = ccxt.poloniexE({
-    "apiKey": "XXXXXXXX-XXXXXXXX-XXXXXXXX-XXXXXXXX",
-    "secret": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
-    })
+def get_market(config):
+    market = ccxt.poloniexE(config)
 
+    # For requests logging
+    market.session.origin_request = market.session.request
 
-# For requests logging
-requests = []
-market.session.origin_request = market.session.request
+    def request_wrap(self, *args, **kwargs):
+        r = self.origin_request(*args, **kwargs)
+        ReportStore.log_http_request(args[0], args[1], kwargs["data"],
+                kwargs["headers"], r)
+        return r
+    market.session.request = request_wrap.__get__(market.session, market.session.__class__)
 
-def request_wrap(self, *args, **kwargs):
-    r = self.origin_request(*args, **kwargs)
-    requests.append({
-        "method": args[0],
-        "url": args[1],
-        "body": kwargs["data"],
-        "headers": kwargs["headers"],
-        "status": r.status_code,
-        "response": r.text,
-        })
-    return r
-market.session.request = request_wrap.__get__(market.session, market.session.__class__)
+    return market