Merge branch 'dev'

[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Trader.git] / market.py

diff --git a/market.py b/market.py
index 82df34f4766ba7648cce4a5e4f364dde948c53b1..546ee948f59ded12e53d9c38e34da24477fda90f 100644 (file)
--- a/market.py
+++ b/market.py
@@ -93,11 +93,11 @@ class Market:
             self.ccxt.check_required_credentials()
             for action in actions:
                 if bool(before) is bool(after):
-                    self.processor.process(action, steps="all")
+                    self.processor.process(action, steps="all", options=self.options)
                 elif before:
-                    self.processor.process(action, steps="before")
+                    self.processor.process(action, steps="before", options=self.options)
                 elif after:
-                    self.processor.process(action, steps="after")
+                    self.processor.process(action, steps="after", options=self.options)
         except AuthenticationError:
             self.report.log_error("market_authentication", message="Impossible to authenticate to market")
         except Exception as e:
@@ -408,7 +408,7 @@ class Processor:
     def can_process(self, scenario_name):
         return scenario_name in self.scenarios
 
-    def process(self, scenario_name, steps="all", **kwargs):
+    def process(self, scenario_name, steps="all", options={}):
         if not self.can_process(scenario_name):
             raise TypeError("Unknown scenario {}".format(scenario_name))
         scenario = self.scenarios[scenario_name]
@@ -420,9 +420,9 @@ class Processor:
             for step in steps:
                 selected_steps += self.select_steps(scenario, step)
         for step in selected_steps:
-            self.process_step(scenario_name, step, kwargs)
+            self.process_step(scenario_name, step, options)
 
-    def process_step(self, scenario_name, step, kwargs):
+    def process_step(self, scenario_name, step, options):
         process_name = "process_{}__{}_{}".format(scenario_name, step["number"], step["name"])
         self.market.report.log_stage("{}_begin".format(process_name))
 
@@ -432,7 +432,7 @@ class Processor:
 
         for action in self.ordered_actions:
             if action in step:
-                self.run_action(action, step[action], kwargs)
+                self.run_action(action, step[action], options)
 
         if "fetch_balances_end" in step:
             self.market.balances.fetch_balances(tag="{}_end".format(process_name),
@@ -466,9 +466,9 @@ class Processor:
 
         return [method, kwargs]
 
-    def parse_args(self, action, default_args, kwargs):
+    def parse_args(self, action, default_args, options):
         method, allowed_arguments = self.method_arguments(action)
-        args = {k: v for k, v in {**default_args, **kwargs, **self.market.options}.items() if k in allowed_arguments }
+        args = {k: v for k, v in {**default_args, **options}.items() if k in allowed_arguments }
 
         if "repartition" in args and "base_currency" in args["repartition"]:
             r = args["repartition"]
@@ -476,7 +476,7 @@ class Processor:
 
         return method, args
 
-    def run_action(self, action, default_args, kwargs):
-        method, args = self.parse_args(action, default_args, kwargs)
+    def run_action(self, action, default_args, options):
+        method, args = self.parse_args(action, default_args, options)
 
         method(**args)