diff --git a/src/strategy_team/strategy_manager.rs b/src/strategy_team/strategy_manager.rs index bd5f5b8..7b5e6e0 100644 --- a/src/strategy_team/strategy_manager.rs +++ b/src/strategy_team/strategy_manager.rs @@ -33,16 +33,16 @@ pub async fn execute_list_up_for_buy( all_data: &AllData, ) -> Result<(), Box> { let mut task_vec = Vec::new(); - // let all_data_c1 = all_data.clone(); + let all_data_c1 = all_data.clone(); let all_data_c2 = 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_c6 = all_data.clone(); - // task_vec.push(tokio::spawn(async move { - // crate::strategy_team::strategy_001::list_up_for_buy(all_data_c1).await; - // })); + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_001::list_up_for_buy(all_data_c1).await; + })); task_vec.push(tokio::spawn(async move { crate::strategy_team::strategy_002::list_up_for_buy(all_data_c2).await; @@ -73,12 +73,83 @@ pub async fn execute_list_up_for_sell( exchange_info_vec: &Vec, trade_fee_vec: &Vec, ) -> Result<(), Box> { - // crate::strategy_team::strategy_001::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; - crate::strategy_team::strategy_002::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; - // crate::strategy_team::strategy_003::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; - crate::strategy_team::strategy_004::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; - // crate::strategy_team::strategy_005::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; - crate::strategy_team::strategy_006::list_up_for_sell(&all_data, &exchange_info_vec, &trade_fee_vec).await?; + let all_data_c1 = all_data.clone(); + let all_data_c2 = 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_c6 = all_data.clone(); + + let exchange_info_vec_c1 = exchange_info_vec.clone(); + let exchange_info_vec_c2 = exchange_info_vec.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_c1 = trade_fee_vec.clone(); + let trade_fee_vec_c2 = trade_fee_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_001::list_up_for_sell( + &all_data_c1, + &exchange_info_vec_c1, + &trade_fee_vec_c1, + ) + .await; + })); + + task_vec.push(tokio::spawn(async move { + crate::strategy_team::strategy_002::list_up_for_sell( + &all_data_c2, + &exchange_info_vec_c2, + &trade_fee_vec_c2, + ) + .await; + })); + + // 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; + // })); + + 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; + })); + + // 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(()) }