X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helper.py;h=be480e28fdbb76df7ae0d91c9130bd2a2e82d379;hb=7bd830a83b662874c145ea9548edfde79eadc68f;hp=21e95c76ab18738875c9e283e2266fd4a5ad631c;hpb=23f4616a85bef7e9acc57740f889a2a0346788af;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/helper.py b/helper.py
index 21e95c7..be480e2 100644
--- a/helper.py
+++ b/helper.py
@@ -129,8 +129,8 @@ def main_process_market(user_market, actions, before=False, after=False):
         if before:
             process_sell_all__1_all_sell(user_market)
         if after:
-            portfolio.Portfolio.wait_for_recent(user_market)
-            process_sell_all__2_all_buy(user_market)
+            process_sell_all__2_wait(user_market)
+            process_sell_all__3_all_buy(user_market)
     else:
         for action in actions:
             if action in globals():
@@ -173,7 +173,7 @@ def process_sell_needed__1_sell(market, liquidity="medium", base_currency="BTC")
 def process_sell_needed__2_buy(market, liquidity="medium", base_currency="BTC"):
     market.report.log_stage("process_sell_needed__2_buy_begin")
     market.balances.fetch_balances(tag="process_sell_needed__2_buy_begin")
-    market.update_trades(base_currency=base_currency, liquidity=liquidity, only="acquire")
+    market.prepare_trades(base_currency=base_currency, liquidity=liquidity, only="acquire")
     market.trades.prepare_orders(compute_value="average", only="acquire")
     market.move_balances()
     market.trades.run_orders()
@@ -191,15 +191,20 @@ def process_sell_all__1_all_sell(market, base_currency="BTC", liquidity="medium"
     market.balances.fetch_balances(tag="process_sell_all__1_all_sell_end")
     market.report.log_stage("process_sell_all__1_all_sell_end")
 
-def process_sell_all__2_all_buy(market, base_currency="BTC", liquidity="medium"):
-    market.report.log_stage("process_sell_all__2_all_buy_begin")
-    market.balances.fetch_balances(tag="process_sell_all__2_all_buy_begin")
+def process_sell_all__2_wait(market, liquidity="medium", base_currency="BTC"):
+    market.report.log_stage("process_sell_all__2_wait_begin")
+    portfolio.Portfolio.wait_for_recent(market)
+    market.report.log_stage("process_sell_all__2_wait_end")
+
+def process_sell_all__3_all_buy(market, base_currency="BTC", liquidity="medium"):
+    market.report.log_stage("process_sell_all__3_all_buy_begin")
+    market.balances.fetch_balances(tag="process_sell_all__3_all_buy_begin")
     market.prepare_trades(liquidity=liquidity, base_currency=base_currency)
     market.trades.prepare_orders(compute_value="average")
     market.move_balances()
     market.trades.run_orders()
     market.follow_orders()
-    market.balances.fetch_balances(tag="process_sell_all__2_all_buy_end")
-    market.report.log_stage("process_sell_all__2_all_buy_end")
+    market.balances.fetch_balances(tag="process_sell_all__3_all_buy_end")
+    market.report.log_stage("process_sell_all__3_all_buy_end")