浏览代码

提交测试版本,移除部分日志。

skyfffire 1 年之前
父节点
当前提交
94169a3b12
共有 3 个文件被更改,包括 20 次插入26 次删除
  1. 11 3
      exchanges/tests/binance_swap_test.rs
  2. 8 22
      strategy/src/binance_usdt_swap.rs
  3. 1 1
      strategy/src/gate_swap.rs

+ 11 - 3
exchanges/tests/binance_swap_test.rs

@@ -6,11 +6,13 @@ use std::time::Duration;
 use futures_util::StreamExt;
 use tokio::sync::Mutex;
 use tokio_tungstenite::tungstenite::Message;
-use tracing::trace;
+use tracing::{info, trace};
 
 use exchanges::binance_swap_rest::BinanceSwapRest;
 use exchanges::binance_swap_ws::{BinanceSwapLogin, BinanceSwapSubscribeType, BinanceSwapWs, BinanceSwapWsType};
+use exchanges::response_base::ResponseData;
 use exchanges::socket_tool::AbstractWsMode;
+use global::trace_stack::TraceStack;
 
 const ACCESS_KEY: &str = "";
 const SECRET_KEY: &str = "";
@@ -23,7 +25,7 @@ async fn ws_custom_subscribe() {
 
 
     let (write_tx, write_rx) = futures_channel::mpsc::unbounded();
-    let (read_tx, mut read_rx) = futures_channel::mpsc::unbounded();
+    let (read_tx, mut read_rx) = futures_channel::mpsc::unbounded::<ResponseData>();
 
     // let (write_tx, write_rx) = tokio::sync::broadcast::channel::<Message>(10);
     // let (read_tx, mut read_rx) = tokio::sync::broadcast::channel::<ResponseData>(10);
@@ -47,7 +49,13 @@ async fn ws_custom_subscribe() {
         trace!("线程-数据读取-开启");
         loop {
             if let Some(data) = read_rx.next().await {
-                trace!("读取数据data:{:?}",data)
+                let mut trace_stack = TraceStack::default();
+                trace_stack.on_after_network(data.time);
+                trace_stack.on_before_unlock_quant();
+
+                if data.time != 0 {
+                    info!("bian>{}", trace_stack.to_string());
+                }
             }
         }
         // trace!("线程-数据读取-结束");

+ 8 - 22
strategy/src/binance_usdt_swap.rs

@@ -43,21 +43,7 @@ pub(crate) async fn reference_binance_swap_run(bool_v1 :Arc<AtomicBool>,
 
             loop {
                 if let Some(data) = read_rx.next().await {
-                    let mut trace_stack = TraceStack::default();
-                    trace_stack.on_after_network(data.time);
-                    trace_stack.on_before_unlock_quant();
-
-                    if data.time != 0 {
-                        println!("bian>{}", trace_stack.to_string());
-                    }
-
-                    // let mut trace_stack = TraceStack::default();
-                    // trace_stack.on_after_network(data.time);
-                    // trace_stack.on_before_unlock_quant();
-                    //
-                    // if data.time != 0 {
-                    //     info!("bian>{}", trace_stack.to_string());
-                    // }
+                    on_data(bot_arc_clone.clone(), &mut update_flag_u, &mut max_buy, &mut min_sell, data).await;
                 }
             }
         });
@@ -73,13 +59,13 @@ async fn on_data(bot_arc_clone: Arc<Mutex<Quant>>,
                  _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_quant();
-    //
-    // if data.time != 0 {
-    //     info!("bian>{}", trace_stack.to_string());
-    // }
+    let mut trace_stack = TraceStack::default();
+    trace_stack.on_after_network(data.time);
+    trace_stack.on_before_unlock_quant();
+
+    if data.time != 0 {
+        info!("bian>{}", trace_stack.to_string());
+    }
 
     // if data.code != "200".to_string() {
     //     return;

+ 1 - 1
strategy/src/gate_swap.rs

@@ -86,7 +86,7 @@ pub async fn gate_swap_run(bool_v1: Arc<AtomicBool>,
                 trace_stack.on_before_unlock_quant();
 
                 if data.time != 0 {
-                    println!("bian>{}", trace_stack.to_string());
+                    info!("gate>{}", trace_stack.to_string());
                 }
                 // on_data(bot_arc_clone.clone(),
                 //         &mut update_flag_u,