JiahengHe пре 2 година
родитељ
комит
c699b2141d
2 измењених фајлова са 10 додато и 10 уклоњено
  1. 2 2
      src/main.rs
  2. 8 8
      strategy/src/exchange_disguise.rs

+ 2 - 2
src/main.rs

@@ -42,9 +42,9 @@ async fn main() {
     quant_arc.lock().await.before_trade().await;
     let ref_name = quant_arc.lock().await.ref_name[0].clone();
     // 参考交易所
-    exchange_disguise::run_reference_exchange("binance".to_string(), quant_arc.clone(), ref_name, params.ref_pair.clone(), exchange_params.clone()).await;
+    exchange_disguise::run_reference_exchange(params.ref_exchange.get(0).unwrap().clone(), quant_arc.clone(), ref_name, params.ref_pair.clone(), exchange_params.clone()).await;
     // 交易交易所
-    exchange_disguise::run_transactional_exchange("gate".to_string(), quant_arc.clone(), trade_name, vec![params.pair.clone()], exchange_params.clone()).await;
+    exchange_disguise::run_transactional_exchange(params.exchange, quant_arc.clone(), trade_name, vec![params.pair.clone()], exchange_params.clone()).await;
     // 启动定期触发的系统逻辑
     quant::on_timer(quant_arc.clone());
     // 启动策略逻辑

+ 8 - 8
strategy/src/exchange_disguise.rs

@@ -19,8 +19,8 @@ use crate::quant::Quant;
 // 交易交易所启动
 pub async fn run_transactional_exchange(exchange_name: String, quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
     match exchange_name.as_str() {
-        "gate" => {
-            transactional_gate_run(quant_arc, name, symbols, exchange_params).await;
+        "gate_usdt_swap" => {
+            transactional_gate_swap_run(quant_arc, name, symbols, exchange_params).await;
         }
         _ => {
             panic!("参数错误!")
@@ -31,8 +31,8 @@ pub async fn run_transactional_exchange(exchange_name: String, quant_arc: Arc<Mu
 // 参考交易所启动
 pub async fn run_reference_exchange(exchange_name: String, quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
     match exchange_name.as_str() {
-        "binance" => {
-            reference_binance_run(quant_arc, name, symbols, exchange_params).await;
+        "binance_usdt_swap" => {
+            reference_binance_swap_run(quant_arc, name, symbols, exchange_params).await;
         }
         _ => {
             panic!("参数错误!")
@@ -40,8 +40,8 @@ pub async fn run_reference_exchange(exchange_name: String, quant_arc: Arc<Mutex<
     }
 }
 
-// 交易 gate 启动
-async fn transactional_gate_run(quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
+// 交易 gate 合约 启动
+async fn transactional_gate_swap_run(quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
     let (tx, mut rx) = channel(100);
     let mut gate_exc = GateSwapRest::new(false, exchange_params.clone());
     // 获取user_id
@@ -164,8 +164,8 @@ async fn transactional_gate_run(quant_arc: Arc<Mutex<Quant>>, name: String, symb
     });
 }
 
-// 参考 币安 启动
-async fn reference_binance_run(quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
+// 参考 币安 合约 启动
+async fn reference_binance_swap_run(quant_arc: Arc<Mutex<Quant>>, name: String, symbols: Vec<String>, exchange_params: BTreeMap<String, String>){
     let (tx, mut rx) = channel(100);
     tokio::spawn( async move {
         let mut ba_exc = BinanceSwapWs::new_label(name, false, exchange_params, BinanceWsType::PublicAndPrivate, tx);