diff --git a/src/strategy_team/strategy_manager.rs b/src/strategy_team/strategy_manager.rs index c4ab3b6..38723ff 100644 --- a/src/strategy_team/strategy_manager.rs +++ b/src/strategy_team/strategy_manager.rs @@ -33,9 +33,9 @@ pub async fn execute_list_up_for_buy( all_data: &AllData, ) -> Result<(), Box> { let mut task_vec = Vec::new(); - // let all_data_c3 = all_data.clone(); + let all_data_c3 = all_data.clone(); let all_data_c4 = all_data.clone(); - let all_data_c5 = all_data.clone(); + // let all_data_c5 = all_data.clone(); let all_data_c6 = all_data.clone(); // strategist_001(all_data).await?; @@ -44,11 +44,14 @@ pub async fn execute_list_up_for_buy( // crate::strategy_team::strategy_003::list_up_for_buy(all_data_c3).await; // })); task_vec.push(tokio::spawn(async move { - crate::strategy_team::strategy_004::list_up_for_buy(all_data_c4).await; + crate::strategy_team::strategy_003::list_up_for_buy(all_data_c3).await; })); task_vec.push(tokio::spawn(async move { - crate::strategy_team::strategy_005::list_up_for_buy(all_data_c5).await; + crate::strategy_team::strategy_004::list_up_for_buy(all_data_c4).await; })); + // task_vec.push(tokio::spawn(async move { + // crate::strategy_team::strategy_005::list_up_for_buy(all_data_c5).await; + // })); task_vec.push(tokio::spawn(async move { crate::strategy_team::strategy_006::list_up_for_buy(all_data_c6).await; })); @@ -66,27 +69,57 @@ pub async fn execute_list_up_for_sell( exchange_info_vec: &Vec, trade_fee_vec: &Vec, ) -> Result<(), Box> { - crate::strategy_team::strategy_004::list_up_for_sell( - all_data, - exchange_info_vec, - trade_fee_vec, - ) - .await?; + let all_data_c3 = all_data.clone(); + let all_data_c4 = all_data.clone(); + let all_data_c5 = all_data.clone(); + let all_data_c6 = all_data.clone(); + let exchange_info_vec_c3 = exchange_info_vec.clone(); + let exchange_info_vec_c4 = exchange_info_vec.clone(); + let exchange_info_vec_c5 = exchange_info_vec.clone(); + let exchange_info_vec_c6 = exchange_info_vec.clone(); + let trade_fee_vec_c3 = trade_fee_vec.clone(); + let trade_fee_vec_c4 = trade_fee_vec.clone(); + let trade_fee_vec_c5 = trade_fee_vec.clone(); + let trade_fee_vec_c6 = trade_fee_vec.clone(); + let mut task_vec = Vec::new(); + + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_003::list_up_for_sell( + &all_data_c3, + &exchange_info_vec_c3, + &trade_fee_vec_c3, + ) + .await; + })); - crate::strategy_team::strategy_005::list_up_for_sell( - all_data, - exchange_info_vec, - trade_fee_vec, - ) - .await?; + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_004::list_up_for_sell( + &all_data_c4, + &exchange_info_vec_c4, + &trade_fee_vec_c4, + ) + .await; + })); - crate::strategy_team::strategy_006::list_up_for_sell( - all_data, - exchange_info_vec, - trade_fee_vec, - ) - .await?; + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_005::list_up_for_sell( + &all_data_c5, + &exchange_info_vec_c5, + &trade_fee_vec_c5, + ) + .await; + })); + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_006::list_up_for_sell( + &all_data_c6, + &exchange_info_vec_c6, + &trade_fee_vec_c6, + ) + .await; + })); + + try_join_all(task_vec).await?; Ok(()) }