瀏覽代碼

params抽取

JiahengHe 2 年之前
父節點
當前提交
2d1a532c92
共有 8 個文件被更改,包括 13 次插入7 次删除
  1. 5 1
      global/Cargo.toml
  2. 2 1
      global/src/lib.rs
  3. 0 0
      global/src/params.rs
  4. 1 1
      src/main.rs
  5. 2 1
      src/quant_libs.rs
  6. 0 1
      strategy/src/lib.rs
  7. 2 1
      strategy/src/quant.rs
  8. 1 1
      strategy/src/strategy.rs

+ 5 - 1
global/Cargo.toml

@@ -9,4 +9,8 @@ edition = "2021"
 rust_decimal = "1.32.0"
 rust_decimal_macros = "1.32.0"
 tracing = "0.1"
-tracing-subscriber = "0.3.17"
+tracing-subscriber = "0.3.17"
+toml = "0.5"
+serde = "1.0.183"
+serde_derive = "1.0"
+serde_json = "1.0.104"

+ 2 - 1
global/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod public_params;
-pub mod log_utils;
+pub mod log_utils;
+pub mod params;

+ 0 - 0
strategy/src/params.rs → global/src/params.rs


+ 1 - 1
src/main.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 use tracing::{info};
-use strategy::params::Params;
+use global::params::Params;
 
 // 日志级别配置
 fn log_level_init(log_str: String) {

+ 2 - 1
src/quant_libs.rs

@@ -1,4 +1,4 @@
-use strategy::params::Params;
+
 use strategy::quant::Quant;
 use std::collections::BTreeMap;
 use std::io::Error;
@@ -8,6 +8,7 @@ use std::sync::atomic::{AtomicBool};
 use std::time::Duration;
 use tokio::sync::{mpsc, Mutex};
 use tracing::{error, info};
+use global::params::Params;
 use standard::exchange::ExchangeEnum::GateSwap;
 use standard::Order;
 use strategy::model::OrderInfo;

+ 0 - 1
strategy/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod params;
 pub mod quant;
 pub mod model;
 mod strategy;

+ 2 - 1
strategy/src/quant.rs

@@ -15,12 +15,13 @@ use tokio::sync::Mutex;
 use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use tracing::{debug, error, info, warn};
+use global::params::Params;
 use global::public_params::{ASK_PRICE_INDEX, BID_PRICE_INDEX, LENGTH};
 use standard::{Account, Market, Order, OrderCommand, Platform, Position, PositionModeEnum, SpecialTicker, Ticker};
 use standard::exchange::{Exchange, ExchangeEnum};
 
 use crate::model::{LocalPosition, OrderInfo, TraderMsg};
-use crate::params::Params;
+
 use crate::predictor::Predictor;
 use crate::strategy::Strategy;
 use crate::utils::{clip};

+ 1 - 1
strategy/src/strategy.rs

@@ -6,11 +6,11 @@ use rust_decimal::Decimal;
 use rust_decimal::prelude::{FromPrimitive, ToPrimitive};
 use rust_decimal_macros::dec;
 use crate::model::{LocalPosition, OrderInfo, TraderMsg};
-use crate::params::Params;
 use crate::utils;
 use tracing::{info, instrument, error, debug};
 use tracing::field::debug;
 use tracing_subscriber;
+use global::params::Params;
 use standard::OrderCommand;
 
 #[derive(Debug)]