bot->core

strategy/src/binance_spot.rs

@@ -31,7 +31,7 @@
 //
 //     // 开启数据读取线程
 //     let write_tx_am = Arc::new(Mutex::new(write_tx));
-//     let bot_arc_clone = core_arc.clone();
+//     let core_arc_clone = core_arc.clone();
 //
 //     spawn(async move {
 //         //链接
@@ -48,7 +48,7 @@
 //
 //         loop {
 //             if let Some(data) = read_rx.next().await {
-//                 on_data(bot_arc_clone.clone(),
+//                 on_data(core_arc_clone.clone(),
 //                         &mut update_flag_u,
 //                         &mut max_buy,
 //                         &mut min_sell,
@@ -69,7 +69,7 @@
 //     // });
 //     //
 //     // spawn(async move {
-//     //     let bot_arc_clone = Arc::clone(&core_arc);
+//     //     let core_arc_clone = Arc::clone(&core_arc);
 //     //     // trade
 //     //     let mut max_buy = Decimal::ZERO;
 //     //     let mut min_sell = Decimal::ZERO;
@@ -80,7 +80,7 @@
 //     //
 //     //         match rx.try_recv() {
 //     //             Ok(data) => {
-//     //                 on_data(bot_arc_clone.clone(), &mut update_flag_u, &mut max_buy, &mut min_sell, data).await;
+//     //                 on_data(core_arc_clone.clone(), &mut update_flag_u, &mut max_buy, &mut min_sell, data).await;
 //     //             },
 //     //             Err(_e) => { }
 //     //         }
@@ -89,7 +89,7 @@
 //     // });
 // }
 //
-// async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
+// async fn on_data(core_arc_clone: Arc<Mutex<Core>>,
 //                  update_flag_u: &mut Decimal,
 //                  _max_buy: &mut Decimal,
 //                  _min_sell: &mut Decimal,
@@ -104,7 +104,7 @@
 //     if data.channel == "aggTrade" {
 //         // let trade: OriginalTradeBa = serde_json::from_str(data.data.as_str()).unwrap();
 //         // let str = data.label.clone();
-//         // let mut core = bot_arc_clone.lock().await;
+//         // let mut core = core_arc_clone.lock().await;
 //         // if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
 //         //     *max_buy = Decimal::ZERO;
 //         //     *min_sell = Decimal::ZERO;
@@ -125,13 +125,13 @@
 //         trace_stack.on_after_format();
 //         trace_stack.on_before_network(special_depth.create_at);
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     } else if data.channel == "depth" {
 //         trace_stack.on_before_format();
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(BinanceSpot, data.clone());
 //         trace_stack.on_after_format();
 //         trace_stack.on_before_network(special_depth.create_at);
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     }
 // }

strategy/src/binance_usdt_swap.rs

@@ -7,7 +7,7 @@ use tokio::sync::Mutex;
 use exchanges::response_base::ResponseData;
 use global::trace_stack::TraceStack;
 use standard::exchange::ExchangeEnum::BinanceSwap;
-use crate::model::{OriginalTradeBa};
+// use crate::model::{OriginalTradeBa};
 use crate::core::Core;
 use exchanges::binance_swap_ws::{BinanceSwapSubscribeType, BinanceSwapWs, BinanceSwapWsType};
 use crate::exchange_disguise::{on_special_depth};
@@ -32,20 +32,15 @@ pub(crate) async fn reference_binance_swap_run(bool_v1 :Arc<AtomicBool>,
         ]);
 
         //读取数据
-        let bot_arc_clone = Arc::clone(&core_arc);
+        let core_arc_clone = Arc::clone(&core_arc);
         tokio::spawn(async move {
             // ticker
             let mut update_flag_u = Decimal::ZERO;
-            // trade
-            let mut max_buy = Decimal::ZERO;
-            let mut min_sell = Decimal::ZERO;
 
             loop {
                 while let Some(data) = read_rx.next().await {
-                    on_data(bot_arc_clone.clone(),
+                    on_data(core_arc_clone.clone(),
                             &mut update_flag_u,
-                            &mut max_buy,
-                            &mut min_sell,
                             data).await;
                 }
             }
@@ -57,10 +52,8 @@ pub(crate) async fn reference_binance_swap_run(bool_v1 :Arc<AtomicBool>,
     });
 }
 
-async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
+async fn on_data(core_arc_clone: Arc<Mutex<Core>>,
                  update_flag_u: &mut Decimal,
-                 _max_buy: &mut Decimal,
-                 _min_sell: &mut Decimal,
                  data: ResponseData) {
     let mut trace_stack = TraceStack::default();
     trace_stack.on_after_network(data.time);
@@ -71,27 +64,27 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
     }
 
     if data.channel == "aggTrade" {
-        let trade: OriginalTradeBa = serde_json::from_str(data.data.as_str()).unwrap();
+        // let trade: OriginalTradeBa = serde_json::from_str(data.data.as_str()).unwrap();
         // let name = data.label.clone();
 
         // 订单流逻辑
-        // on_trade(trade.clone(), bot_arc_clone.clone()).await;
+        // on_trade(trade.clone(), core_arc_clone.clone()).await;
 
         // 原本的逻辑
-        let mut core = bot_arc_clone.lock().await;
-        let str = data.label.clone();
-        if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
-            *_max_buy = Decimal::ZERO;
-            *_min_sell = Decimal::ZERO;
-            core.is_update.remove(str.as_str());
-        }
-        if trade.p > *_max_buy || *_max_buy == Decimal::ZERO {
-            *_max_buy = trade.p
-        }
-        if trade.p < *_min_sell || *_min_sell == Decimal::ZERO {
-            *_min_sell = trade.p
-        }
-        core.max_buy_min_sell_cache.insert(data.label, vec![*_max_buy, *_min_sell]);
+        // let mut core = core_arc_clone.lock().await;
+        // let str = data.label.clone();
+        // if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
+        //     *_max_buy = Decimal::ZERO;
+        //     *_min_sell = Decimal::ZERO;
+        //     core.is_update.remove(str.as_str());
+        // }
+        // if trade.p > *_max_buy || *_max_buy == Decimal::ZERO {
+        //     *_max_buy = trade.p
+        // }
+        // if trade.p < *_min_sell || *_min_sell == Decimal::ZERO {
+        //     *_min_sell = trade.p
+        // }
+        // core.max_buy_min_sell_cache.insert(data.label, vec![*_max_buy, *_min_sell]);
     } else if data.channel == "bookTicker" {
         trace_stack.on_before_format();
         // 将ticker数据转换为模拟深度
@@ -99,7 +92,7 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
         trace_stack.on_before_network(special_depth.create_at.clone());
         trace_stack.on_after_format();
 
-        on_special_depth(bot_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;
+        on_special_depth(core_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;
     } else if data.channel == "depth" {
         trace_stack.on_before_format();
         // 将depth数据转换为模拟深度
@@ -107,6 +100,6 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
         trace_stack.on_before_network(special_depth.create_at.clone());
         trace_stack.on_after_format();
 
-        on_special_depth(bot_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;
+        on_special_depth(core_arc_clone, update_flag_u, data.label.clone(), trace_stack, special_depth).await;
     }
 }

strategy/src/bitget_spot.rs

@@ -53,7 +53,7 @@
 //             .await.expect("链接失败(内部一个心跳线程应该已经关闭了)");
 //     });
 //     // 消费数据
-//     let bot_arc_clone = core_arc.clone();
+//     let core_arc_clone = core_arc.clone();
 //     spawn(async move {
 //         // ticker
 //         let mut update_flag_u = Decimal::ZERO;
@@ -62,7 +62,7 @@
 //
 //         loop {
 //             if let Some(data) = read_rx_public.next().await {
-//                 on_public_data(bot_arc_clone.clone(),
+//                 on_public_data(core_arc_clone.clone(),
 //                         &mut update_flag_u,
 //                         &mut max_buy,
 //                         &mut min_sell,
@@ -112,13 +112,13 @@
 //         });
 //
 //         // 消费数据
-//         let bot_arc_clone = core_arc.clone();
+//         let core_arc_clone = core_arc.clone();
 //         spawn(async move {
 //             let ct_val = core_arc.clone().lock().await.platform_rest.get_self_market().ct_val;
 //
 //             loop {
 //                 if let Some(data) = read_rx_public.next().await {
-//                     on_private_data(bot_arc_clone.clone(),
+//                     on_private_data(core_arc_clone.clone(),
 //                                    ct_val,
 //                                    data).await;
 //                 }
@@ -127,7 +127,7 @@
 //     }
 // }
 //
-// async fn on_private_data(bot_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData) {
+// async fn on_private_data(core_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData) {
 //     let mut trace_stack = TraceStack::default();
 //
 //     trace_stack.on_after_network(data.time);
@@ -164,19 +164,19 @@
 //             order_infos.push(order_info);
 //         }
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_order(order_infos, trace_stack);
 //         }
 //     } else if data.channel == "account" {
 //         // let account = standard::handle_info::HandleSwapInfo::handle_account_info(BitgetSpot, data, run_symbol.clone());
 //         // {
-//         //     let mut core = bot_arc_clone.lock().await;
+//         //     let mut core = core_arc_clone.lock().await;
 //         //     core.update_equity(account);
 //         // }
 //     }
 // }
 //
-// async fn on_public_data(bot_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData) {
+// async fn on_public_data(core_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData) {
 //     let mut trace_stack = TraceStack::default();
 //
 //     trace_stack.on_after_network(data.time);
@@ -191,9 +191,9 @@
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(BitgetSpot, data.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     } else if data.channel == "trade" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
 //             *max_buy = Decimal::ZERO;

strategy/src/bybit_usdt_swap.rs

@@ -49,7 +49,7 @@
 //                                    read_tx_public).await.expect("链接失败(内部一个心跳线程应该已经关闭了)");
 //     });
 //     // 消费数据
-//     let bot_arc_clone = _core_arc.clone();
+//     let core_arc_clone = _core_arc.clone();
 //     // 接收public数据
 //     spawn(async move {
 //         // ticker
@@ -61,7 +61,7 @@
 //
 //         loop {
 //             if let Some(public_data) = read_rx_public.next().await {
-//                 on_public_data(bot_arc_clone.clone(),
+//                 on_public_data(core_arc_clone.clone(),
 //                                &mut update_flag_u,
 //                                &mut max_buy,
 //                                &mut min_sell,
@@ -98,14 +98,14 @@
 //         });
 //
 //         // 消费数据
-//         let bot_arc_clone = _core_arc.clone();
+//         let core_arc_clone = _core_arc.clone();
 //         // 接收private信息
 //         spawn(async move {
-//             let ct_val = bot_arc_clone.clone().lock().await.platform_rest.get_self_market().ct_val;
+//             let ct_val = core_arc_clone.clone().lock().await.platform_rest.get_self_market().ct_val;
 //             let run_symbol = symbols.clone()[0].clone();
 //             loop {
 //                 if let Some(private_data) = read_rx_private.next().await {
-//                     on_private_data(bot_arc_clone.clone(),
+//                     on_private_data(core_arc_clone.clone(),
 //                                     ct_val,
 //                                     private_data,
 //                                     run_symbol.clone()).await;
@@ -131,7 +131,7 @@
 //
 //
 //
-// async fn on_private_data(bot_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData, run_symbol: String) {
+// async fn on_private_data(core_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData, run_symbol: String) {
 //     let mut trace_stack = TraceStack::default();
 //
 //     trace_stack.on_after_network(data.time);
@@ -143,7 +143,7 @@
 //     if data.channel == "wallet" {
 //         let account = standard::handle_info::HandleSwapInfo::handle_account_info(BybitSwap, data, run_symbol.clone());
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_equity(account).await;
 //         }
 //     } else if data.channel == "order" {
@@ -175,19 +175,19 @@
 //         }
 //
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_order(order_infos, trace_stack);
 //         }
 //     } else if data.channel == "position" {
 //         let positions = standard::handle_info::HandleSwapInfo::handle_position(BybitSwap,data, ct_val.clone());
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_position(positions).await;
 //         }
 //     }
 // }
 //
-// async fn on_public_data(bot_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData, depth_asks: &mut Vec<MarketOrder>, depth_bids: &mut Vec<MarketOrder>) {
+// async fn on_public_data(core_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData, depth_asks: &mut Vec<MarketOrder>, depth_bids: &mut Vec<MarketOrder>) {
 //     let mut trace_stack = TraceStack::default();
 //     trace_stack.on_after_network(data.time);
 //     trace_stack.on_before_unlock_core();
@@ -218,9 +218,9 @@
 //         trace_stack.on_before_network(depth_format.create_at.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, label, trace_stack, depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, label, trace_stack, depth).await;
 //     } else if data.channel == "trade" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap(){
 //             *max_buy = Decimal::ZERO;

strategy/src/exchange_disguise.rs

@@ -87,14 +87,14 @@ pub async fn run_reference_exchange(bool_v1: Arc<AtomicBool>,
     }
 }
 
-pub async fn on_special_depth(bot_arc: Arc<Mutex<Core>>,
+pub async fn on_special_depth(core_arc: Arc<Mutex<Core>>,
                               update_flag_u: &mut Decimal,
                               label: String,
                               trace_stack: TraceStack,
                               special_depth: SpecialDepth) {
     if special_depth.t > *update_flag_u {
         *update_flag_u = special_depth.t;
-        let mut core = bot_arc.lock().await;
+        let mut core = core_arc.lock().await;
         let mut ts = trace_stack.clone();
         ts.on_before_core();
 
@@ -105,27 +105,27 @@ pub async fn on_special_depth(bot_arc: Arc<Mutex<Core>>,
 }
 
 // pub async fn on_trade(trade: OriginalTradeBa,
-//                       bot_arc_clone: Arc<Mutex<Core>>) {
-    // let mut bot = bot_arc_clone.lock().await;
-    // // 1. 塞入数据到bot
-    // bot.trades.push(trade.clone());
+//                       core_arc_clone: Arc<Mutex<Core>>) {
+    // let mut core = core_arc_clone.lock().await;
+    // // 1. 塞入数据到core
+    // core.trades.push(trade.clone());
     // // 2. 长度检查
-    // if bot.trades.len() > bot.recall_max_count {
-    //     bot.trades.remove(0);
+    // if core.trades.len() > core.recall_max_count {
+    //     core.trades.remove(0);
     // }
     // // 3. 如果少于100条，不进行判断
-    // if bot.trades.len() < 100 {
+    // if core.trades.len() < 100 {
     //     return;
     // }
     // // 求最近的多空总和
     // let mut long_sum = Decimal::ZERO;
     // let mut short_sum = Decimal::ZERO;
     // let last_trade_t = trade.t.clone();
-    // let mut rev = bot.trades.clone();
+    // let mut rev = core.trades.clone();
     // rev.reverse();
     // for trade_o in rev {
     //     // 如果该元素已过期，我们是按时间顺序插入的，说明前面的应该都过期了，跳出循环，停止检测
-    //     if trade_o.t < last_trade_t - bot.recall_time {
+    //     if trade_o.t < last_trade_t - core.recall_time {
     //         continue;
     //     }
     //
@@ -138,17 +138,17 @@ pub async fn on_special_depth(bot_arc: Arc<Mutex<Core>>,
     // }
     //
     // // 做多主动性
-    // if (long_sum / (long_sum + short_sum)) > bot.long_volume_rate {
-    //     if bot.side != "long".to_string() {
-    //         bot.side = "long".to_string();
+    // if (long_sum / (long_sum + short_sum)) > core.long_volume_rate {
+    //     if core.side != "long".to_string() {
+    //         core.side = "long".to_string();
     //     }
-    // } else if (short_sum / (long_sum + short_sum)) > bot.short_volume_rate {
-    //     if bot.side != "short".to_string() {
-    //         bot.side = "short".to_string();
+    // } else if (short_sum / (long_sum + short_sum)) > core.short_volume_rate {
+    //     if core.side != "short".to_string() {
+    //         core.side = "short".to_string();
     //     }
     // } else {
-    //     if bot.side != "normal".to_string() {
-    //         bot.side = "normal".to_string();
+    //     if core.side != "normal".to_string() {
+    //         core.side = "normal".to_string();
     //     }
     // }
 // }

strategy/src/gate_swap.rs

@@ -71,17 +71,17 @@
 //     });
 //
 //     spawn(async move {
-//         let bot_arc_clone = Arc::clone(&core_arc);
+//         let core_arc_clone = Arc::clone(&core_arc);
 //         let run_symbol = symbols.clone()[0].clone();
 //         // trade
 //         let mut update_flag_u = Decimal::ZERO;
 //         let mut max_buy = Decimal::ZERO;
 //         let mut min_sell = Decimal::ZERO;
-//         let multiplier = bot_arc_clone.lock().await.platform_rest.get_self_market().amount_size;
+//         let multiplier = core_arc_clone.lock().await.platform_rest.get_self_market().amount_size;
 //
 //         loop {
 //             while let Some(data) = read_rx.next().await {
-//                 on_data(bot_arc_clone.clone(),
+//                 on_data(core_arc_clone.clone(),
 //                         &mut update_flag_u,
 //                         multiplier,
 //                         run_symbol.clone(),
@@ -93,7 +93,7 @@
 //     });
 // }
 //
-// async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
+// async fn on_data(core_arc_clone: Arc<Mutex<Core>>,
 //                  update_flag_u: &mut Decimal,
 //                  multiplier: Decimal,
 //                  run_symbol: String,
@@ -114,11 +114,11 @@
 //         trace_stack.on_before_network(depth.create_at.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, depth).await;
 //     } else if data.channel == "futures.balances" {
 //         let account = standard::handle_info::HandleSwapInfo::handle_account_info(GateSwap, data, run_symbol.clone());
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_equity(account).await;
 //         }
 //     } else if data.channel == "futures.orders" {
@@ -147,17 +147,17 @@
 //         }
 //
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_order(order_infos, trace_stack);
 //         }
 //     } else if data.channel == "futures.positions" {
 //         let positions = standard::handle_info::HandleSwapInfo::handle_position(GateSwap,data, multiplier.clone());
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_position(positions).await;
 //         }
 //     } else if data.channel == "futures.trades" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap(){
 //             *max_buy = Decimal::ZERO;

strategy/src/kucoin_spot.rs

@@ -48,18 +48,18 @@
 //     //读取
 //     // let bool_v1_clone = Arc::clone(&bool_v1);
 //     tokio::spawn(async move {
-//         let bot_arc_clone = Arc::clone(&core_arc);
+//         let core_arc_clone = Arc::clone(&core_arc);
 //         // trade
 //         let mut update_flag_u = Decimal::ZERO;
 //         let mut max_buy = Decimal::ZERO;
 //         let mut min_sell = Decimal::ZERO;
 //         let multiplier = Decimal::ONE;
-//         // let multiplier = bot_arc_clone.lock().await.platform_rest.get_self_market().ct_val;
+//         // let multiplier = core_arc_clone.lock().await.platform_rest.get_self_market().ct_val;
 //         // let run_symbol = symbols.clone()[0].clone();
 //
 //         loop {
 //             if let Some(data) = read_rx.next().await {
-//                 on_kucoin_spot_data(bot_arc_clone.clone(),
+//                 on_kucoin_spot_data(core_arc_clone.clone(),
 //                                     &mut update_flag_u,
 //                                     multiplier,
 //                                     &mut max_buy,
@@ -70,7 +70,7 @@
 //     });
 // }
 //
-// async fn on_kucoin_spot_data(bot_arc_clone: Arc<Mutex<Core>>,
+// async fn on_kucoin_spot_data(core_arc_clone: Arc<Mutex<Core>>,
 //                              update_flag_u: &mut Decimal,
 //                              _multiplier: Decimal,
 //                              max_buy: &mut Decimal,
@@ -90,16 +90,16 @@
 //         trace_stack.on_before_network(special_depth.create_at.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     } else if data.channel == "trade.ticker" {
 //         trace_stack.on_before_format();
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_ticker(KucoinSpot, data.clone());
 //         trace_stack.on_before_network(special_depth.create_at.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     }  else if data.channel == "trade.l3match" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
 //             *max_buy = Decimal::ZERO;
@@ -118,7 +118,7 @@
 //         // 取消原有推送解析，因为推送的信息不准确
 //         // let account = standard::handle_info::HandleSwapInfo::handle_account_info(KucoinSwap, data, run_symbol.clone());
 //         // {
-//         //     let mut core = bot_arc_clone.lock().await;
+//         //     let mut core = core_arc_clone.lock().await;
 //         //     core.update_equity(account);
 //         // }
 //     } else if data.channel == "symbolOrderChange" {
@@ -149,13 +149,13 @@
 //         // }
 //         //
 //         // {
-//         //     let mut core = bot_arc_clone.lock().await;
+//         //     let mut core = core_arc_clone.lock().await;
 //         //     core.update_order(order_infos, trace_stack);
 //         // }
 //     } else if data.channel == "position.change" {
 //         // let positions = standard::handle_info::HandleSwapInfo::handle_position(KucoinSwap,data, multiplier);
 //         // {
-//         //     let mut core = bot_arc_clone.lock().await;
+//         //     let mut core = core_arc_clone.lock().await;
 //         //     core.update_position(positions);
 //         // }
 //     }

strategy/src/kucoin_swap.rs

@@ -87,17 +87,17 @@
 //
 //         // 数据处理协程
 //         spawn(async move {
-//             let bot_arc_clone = Arc::clone(&core_arc);
+//             let core_arc_clone = Arc::clone(&core_arc);
 //
 //             // ticker
 //             let mut update_flag_u = Decimal::ZERO;
 //             let mut max_buy = Decimal::ZERO;
 //             let mut min_sell = Decimal::ZERO;
-//             let multiplier = bot_arc_clone.lock().await.platform_rest.get_self_market().ct_val;
+//             let multiplier = core_arc_clone.lock().await.platform_rest.get_self_market().ct_val;
 //
 //             loop {
 //                 if let Some(data) = read_rx.next().await {
-//                     on_data(bot_arc_clone.clone(),
+//                     on_data(core_arc_clone.clone(),
 //                             &mut update_flag_u,
 //                             multiplier,
 //                             &mut max_buy,
@@ -109,7 +109,7 @@
 //     });
 // }
 //
-// async fn on_data(bot_arc_clone: Arc<Mutex<Core>>,
+// async fn on_data(core_arc_clone: Arc<Mutex<Core>>,
 //                  update_flag_u: &mut Decimal,
 //                  multiplier: Decimal,
 //                  max_buy: &mut Decimal,
@@ -128,17 +128,17 @@
 //         trace_stack.on_before_network(special_depth.create_at.clone());
 //         trace_stack.on_after_format();
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
 //     } else if data.channel == "tickerV2" {
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_ticker(KucoinSwap, data.clone());
 //         trace_stack.on_before_network(special_depth.create_at.clone());
 //
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await
 //     } else if data.channel == "availableBalance.change" {
 //         // 取消原有推送解析，因为推送的信息不准确
 //         // let account = standard::handle_info::HandleSwapInfo::handle_account_info(KucoinSwap, data, run_symbol.clone());
 //         // {
-//         //     let mut core = bot_arc_clone.lock().await;
+//         //     let mut core = core_arc_clone.lock().await;
 //         //     core.update_equity(account);
 //         // }
 //     } else if data.channel == "symbolOrderChange" {
@@ -169,17 +169,17 @@
 //         }
 //
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_order(order_infos, trace_stack);
 //         }
 //     } else if data.channel == "position.change" {
 //         let positions = standard::handle_info::HandleSwapInfo::handle_position(KucoinSwap,data, multiplier);
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_position(positions).await;
 //         }
 //     } else if data.channel == "match" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap() {
 //             *max_buy = Decimal::ZERO;

strategy/src/okx_usdt_swap.rs

@@ -44,7 +44,7 @@
 //                                    read_tx_public).await.expect("链接失败(内部一个心跳线程应该已经关闭了)");
 //     });
 //     // 消费数据
-//     let bot_arc_clone = _core_arc.clone();
+//     let core_arc_clone = _core_arc.clone();
 //     // 接收public数据
 //     tokio::spawn(async move {
 //         // ticker
@@ -54,7 +54,7 @@
 //
 //         loop {
 //             if let Some(public_data) = read_rx_public.next().await {
-//                 on_public_data(bot_arc_clone.clone(),
+//                 on_public_data(core_arc_clone.clone(),
 //                                &mut update_flag_u,
 //                                &mut max_buy,
 //                                &mut min_sell,
@@ -89,14 +89,14 @@
 //         });
 //
 //         // 消费数据
-//         let bot_arc_clone = _core_arc.clone();
+//         let core_arc_clone = _core_arc.clone();
 //         // 接收private信息
 //         tokio::spawn(async move {
 //             let ct_val = _core_arc.clone().lock().await.platform_rest.get_self_market().ct_val;
 //             let run_symbol = symbols.clone()[0].clone();
 //             loop {
 //                 if let Some(private_data) = read_rx_private.next().await {
-//                     on_private_data(bot_arc_clone.clone(),
+//                     on_private_data(core_arc_clone.clone(),
 //                                     ct_val,
 //                                     private_data,
 //                                     run_symbol.clone()).await;
@@ -106,7 +106,7 @@
 //     }
 // }
 //
-// async fn on_private_data(bot_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData, run_symbol: String) {
+// async fn on_private_data(core_arc_clone: Arc<Mutex<Core>>, ct_val: Decimal, data: ResponseData, run_symbol: String) {
 //     let mut trace_stack = TraceStack::default();
 //
 //     trace_stack.on_after_network(data.time);
@@ -142,25 +142,25 @@
 //             order_infos.push(order_info);
 //         }
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_order(order_infos, trace_stack);
 //         }
 //     } else if data.channel == "balance_and_position" {
 //         let positions = standard::handle_info::HandleSwapInfo::handle_position(OkxSwap,data, ct_val);
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_position(positions).await;
 //         }
 //     } else if data.channel == "account" {
 //         let account = standard::handle_info::HandleSwapInfo::handle_account_info(OkxSwap, data.clone(), run_symbol.clone());
 //         {
-//             let mut core = bot_arc_clone.lock().await;
+//             let mut core = core_arc_clone.lock().await;
 //             core.update_equity(account).await;
 //         }
 //     }
 // }
 //
-// async fn on_public_data(bot_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData) {
+// async fn on_public_data(core_arc_clone: Arc<Mutex<Core>>, update_flag_u: &mut Decimal, max_buy: &mut Decimal, min_sell: &mut Decimal, data: ResponseData) {
 //     let mut trace_stack = TraceStack::default();
 //     trace_stack.on_after_network(data.time);
 //     trace_stack.on_before_unlock_core();
@@ -172,9 +172,9 @@
 //         trace_stack.on_before_format();
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(OkxSwap, data.clone());
 //         trace_stack.on_after_format();
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     } else if data.channel == "trades" {
-//         let mut core = bot_arc_clone.lock().await;
+//         let mut core = core_arc_clone.lock().await;
 //         let str = data.label.clone();
 //         if core.is_update.contains_key(&data.label) && *core.is_update.get(str.as_str()).unwrap(){
 //             *max_buy = Decimal::ZERO;
@@ -195,7 +195,7 @@
 //         trace_stack.on_before_format();
 //         let special_depth = standard::handle_info::HandleSwapInfo::handle_special_depth(OkxSwap, data.clone());
 //         trace_stack.on_after_format();
-//         on_special_depth(bot_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
+//         on_special_depth(core_arc_clone, update_flag_u, data.label, trace_stack, special_depth).await;
 //     }
 // }
 //