X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=8672c59699431846ac097173bf5cb9ab076b3910;hb=81d1db5117b61c2bb9f114cfc59f015e97c6eb9b;hp=6c14ae208af3add2eb1bf65ab6627696945e8b22;hpb=1f117ac79e10c3c9728d3b267d134dec2a165603;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/market.py b/market.py
index 6c14ae2..8672c59 100644
--- a/market.py
+++ b/market.py
@@ -46,6 +46,7 @@ class Market:
         return cls(ccxt_instance, debug=debug, user_id=user_id, report_path=report_path)
 
     def store_report(self):
+        self.report.merge(Portfolio.report)
         try:
             if self.report_path is not None:
                 report_file = "{}/{}_{}.json".format(self.report_path, datetime.now().isoformat(), self.user_id)
@@ -192,6 +193,33 @@ class Market:
 
 class Processor:
     scenarios = {
+            "wait_for_cryptoportfolio": [
+                {
+                    "name": "wait",
+                    "number": 1,
+                    "before": False,
+                    "after": True,
+                    "wait_for_recent": {},
+                    },
+                ],
+            "print_orders": [
+                {
+                    "name": "wait",
+                    "number": 1,
+                    "before": False,
+                    "after": True,
+                    "wait_for_recent": {},
+                    },
+                {
+                    "name": "make_orders",
+                    "number": 2,
+                    "before": False,
+                    "after": True,
+                    "fetch_balances": ["begin"],
+                    "prepare_trades": { "compute_value": "average" },
+                    "prepare_orders": { "compute_value": "average" },
+                    },
+                ],
             "sell_needed": [
                 {
                     "name": "wait",
@@ -312,7 +340,7 @@ class Processor:
         import inspect
 
         if action == "wait_for_recent":
-            method = portfolio.Portfolio.wait_for_recent
+            method = Portfolio.wait_for_recent
         elif action == "prepare_trades":
             method = self.market.prepare_trades
         elif action == "prepare_orders":
@@ -345,8 +373,4 @@ class Processor:
     def run_action(self, action, default_args, kwargs):
         method, args = self.parse_args(action, default_args, kwargs)
 
-        if action == "wait_for_recent":
-            method(self.market, **args)
-        else:
-            method(**args)
-
+        method(**args)