优化代码

exchanges/src/binance_spot_rest.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 pub struct BinanceSpotRest {}
 
 impl BinanceSpotRest {
-    pub fn new(is_colo: bool,  login_param: BTreeMap<String, String>) -> BinanceSpotRest
+    pub fn new(_is_colo: bool,  _login_param: BTreeMap<String, String>) -> BinanceSpotRest
     {
         BinanceSpotRest {}
     }

exchanges/src/binance_spot_ws.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 pub struct BinanceSpotWs {}
 
 impl BinanceSpotWs {
-    pub fn new(is_colo: bool,  login_param: BTreeMap<String, String>) -> BinanceSpotWs
+    pub fn new(_is_colo: bool,  _login_param: BTreeMap<String, String>) -> BinanceSpotWs
     {
         BinanceSpotWs {}
     }

exchanges/src/binance_usdt_swap_ws.rs

@@ -20,7 +20,7 @@ pub struct BinanceUsdtSwapWs {
     //端口
     port: u16,
     //登陆所需参数
-    login_param: BTreeMap<String, String>,
+    // login_param: BTreeMap<String, String>,
 
     sender: mpsc::Sender<ResponseData>,
 }
@@ -30,7 +30,7 @@ impl BinanceUsdtSwapWs {
     /*****************************************获取一个对象****************************************************/
     /*******************************************************************************************************/
     pub fn new(is_colo: bool,
-               login_param: BTreeMap<String, String>,
+               _login_param: BTreeMap<String, String>,
                sender: mpsc::Sender<ResponseData>,
     ) -> BinanceUsdtSwapWs
     {
@@ -55,7 +55,7 @@ impl BinanceUsdtSwapWs {
             request_url: base_url,
             ip: ip_v.clone().to_string(),
             port: port_v,
-            login_param,
+            // login_param,
             sender,
         }
     }

exchanges/src/gate_spot_rest.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 pub struct GateSpotRest {}
 
 impl GateSpotRest {
-    pub fn new(is_colo: bool,  login_param: BTreeMap<String, String>) -> GateSpotRest
+    pub fn new(_is_colo: bool,  _login_param: BTreeMap<String, String>) -> GateSpotRest
     {
         GateSpotRest {}
     }

exchanges/src/gate_spot_ws.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 pub struct GateSpotWs {}
 
 impl GateSpotWs {
-    pub fn new(is_colo: bool, login_param: BTreeMap<String, String>) -> GateSpotWs
+    pub fn new(_is_colo: bool, _login_param: BTreeMap<String, String>) -> GateSpotWs
     {
         GateSpotWs {}
     }

exchanges/src/gate_swap_ws.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 pub struct GateSwapWs {}
 
 impl GateSwapWs {
-    pub fn new(is_colo: bool, login_param: BTreeMap<String, String>) -> GateSwapWs
+    pub fn new(_is_colo: bool, _login_param: BTreeMap<String, String>) -> GateSwapWs
     {
         GateSwapWs {}
     }

exchanges/src/kuconin_swap_ws.rs

@@ -1,5 +1,5 @@
 use std::collections::{BTreeMap, HashSet};
-use std::io;
+use std::{io};
 use std::io::{Write};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::{mpsc};
@@ -44,7 +44,7 @@ pub struct KuconinSwapWs {
     //实际ws 链接地址
     proxy: ParsingDetail,
     //代理信息
-    login_param: BTreeMap<String, String>,
+    // login_param: BTreeMap<String, String>,
     //登陆数据
     ws_param: KuconinWsParam,
     //kuconis特殊参数
@@ -92,7 +92,7 @@ impl KuconinSwapWs {
         KuconinSwapWs {
             request_url: "".to_string(),
             proxy: parsing_detail,
-            login_param,
+            // login_param,
             ws_param,
             symbol_s: vec![],
             subscribe_types: vec![],
@@ -230,6 +230,8 @@ impl KuconinSwapWs {
                     accept_unmasked_frames: false,
                 });
                 let max_redirects = 5;
+
+
                 let _ = match connect_with_proxy(request_url.clone(),
                                                  proxy_address, websocket_config, max_redirects) {
                     Ok(ws) => {
@@ -279,7 +281,7 @@ impl KuconinSwapWs {
                         }
                     } else {
                         //心跳-一定时间间隔发送心跳
-                        let  get_time = chrono::Utc::now().timestamp_millis();
+                        let get_time = chrono::Utc::now().timestamp_millis();
                         // println!("--心跳-{}-{}-{}-{}-{}", get_time, ping_interval
                         //          , (get_time - ping_interval), self.ws_param.ws_ping_interval, (get_time - ping_interval) >= self.ws_param.ws_ping_interval);
                         if (get_time - ping_interval) >= self.ws_param.ws_ping_interval {
@@ -345,7 +347,7 @@ impl KuconinSwapWs {
                         }
                     } else {
                         //心跳-一定时间间隔发送心跳
-                        let  get_time = chrono::Utc::now().timestamp_millis();
+                        let get_time = chrono::Utc::now().timestamp_millis();
                         // println!("--心跳-{}-{}-{}-{}-{}", get_time, ping_interval
                         //          , (get_time - ping_interval), self.ws_param.ws_ping_interval, (get_time - ping_interval) >= self.ws_param.ws_ping_interval);
                         if (get_time - ping_interval) >= self.ws_param.ws_ping_interval {

exchanges/tests/test.rs

@@ -1,19 +1,15 @@
-use std::{fs, io, thread};
+use std::{fs, thread};
 use exchanges::gate_swap_rest::GateSwapRest;
 use std::collections::BTreeMap;
-use std::io::{BufRead, BufReader, Read, Write};
+use std::io::{BufRead, BufReader,  Write};
 use std::net::{TcpListener, TcpStream};
-use std::sync::{Arc, mpsc};
-use std::time::Duration;
-use serde_json::json;
+use std::sync::{mpsc};
 use exchanges::binance_usdt_swap_rest::BinanceUsdtSwapRest;
 use exchanges::kucoin_swap_rest::KucoinSwapRest;
 use exchanges::kuconin_swap_ws::{KuconinSubscribeType, KuconinSwapWs, KuconinWsType};
-use exchanges::{proxy, socket_tool};
+use exchanges::{proxy};
 use exchanges::binance_usdt_swap_ws::BinanceUsdtSwapWs;
 use exchanges::okx_swap_ws::{OkxSubscribeType, OkxSwapWs, OkxWsType};
-use exchanges::response_base::ResponseData;
-use crate::proxy::ParsingDetail;
 
 
 #[tokio::test]
@@ -51,7 +47,7 @@ async fn test_import() {
 }
 
 async fn demo_ws_okx_pu() {
-    let mut btree_map: BTreeMap<String, String> = BTreeMap::new();
+    let  btree_map: BTreeMap<String, String> = BTreeMap::new();
     let (tx, rx) = mpsc::channel();
     let mut ku_ws = OkxSwapWs::new(false, btree_map, OkxWsType::Public, tx).await;
     ku_ws.set_subscribe(vec![OkxSubscribeType::PuIndexTickers]);
@@ -67,7 +63,7 @@ async fn demo_ws_okx_pu() {
 }
 
 async fn demo_ws_okx_bu() {
-    let mut btree_map: BTreeMap<String, String> = BTreeMap::new();
+    let btree_map: BTreeMap<String, String> = BTreeMap::new();
     let (tx, rx) = mpsc::channel();
     let mut ku_ws = OkxSwapWs::new(false, btree_map, OkxWsType::Business, tx).await;
     ku_ws.set_subscribe(vec![OkxSubscribeType::BuIndexCandle30m]);
@@ -84,9 +80,9 @@ async fn demo_ws_okx_bu() {
 
 async fn demo_ws_kucoin_pr() {
     let mut btree_map: BTreeMap<String, String> = BTreeMap::new();
-    btree_map.insert("access_key".to_string(), "".to_string());
-    btree_map.insert("secret_key".to_string(), "".to_string());
-    btree_map.insert("pass_key".to_string(), "".to_string());
+    btree_map.insert("access_key".to_string(), "6393f3565f0d4500011f846b".to_string());
+    btree_map.insert("secret_key".to_string(), "9c0df8b7-daaa-493e-a53a-82703067f7dd".to_string());
+    btree_map.insert("pass_key".to_string(), "b87d055f".to_string());
     println!("----------------------btree_map{:?}", btree_map.clone());
     let (tx, rx) = mpsc::channel();
     let mut ku_ws = KuconinSwapWs::new(false, btree_map.clone(),
@@ -104,7 +100,7 @@ async fn demo_ws_kucoin_pr() {
 }
 
 async fn demo_ws_kucoin_pu() {
-    let mut btree_map: BTreeMap<String, String> = BTreeMap::new();
+    let  btree_map: BTreeMap<String, String> = BTreeMap::new();
     let (tx, rx) = mpsc::channel();
     let mut ku_ws = KuconinSwapWs::new(false, btree_map, KuconinWsType::Public, tx).await;
     ku_ws.set_subscribe(vec![KuconinSubscribeType::PuContractMarketLevel2Depth50]);