style: _

Author: valeratrades

discretionary_engine/src/config.rs

@@ -27,6 +27,11 @@ pub struct AppConfig {
 	#[settings(flatten)]
 	pub risk: Option<RiskConfig>,
 }
+impl AppConfig {
+	pub fn get_exchange(&self, exchange: ExchangeName) -> Result<&ExchangeConfig> {
+		self.exchanges.get(&exchange.to_string()).ok_or_else(|| eyre!("{exchange} exchange config not found"))
+	}
+}
 
 #[derive(Clone, Debug, v_macros::MyConfigPrimitives)]
 pub struct ExchangeConfig {
@@ -65,9 +70,3 @@ pub struct RiskLayersConfig {
 	#[serde(default)]
 	pub lost_last_trade: bool,
 }
-
-impl AppConfig {
-	pub fn get_exchange(&self, exchange: ExchangeName) -> Result<&ExchangeConfig> {
-		self.exchanges.get(&exchange.to_string()).ok_or_else(|| eyre!("{exchange} exchange config not found"))
-	}
-}

discretionary_engine/src/exchange_apis/binance/info.rs

@@ -81,36 +81,6 @@ pub struct RateLimit {
 // 	multiplierDecimal: u32,
 //}
 
-#[serde_as]
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FuturesSymbol {
-	pub symbol: String,
-	pub pair: String,
-	pub contract_type: String,
-	pub delivery_date: i64,
-	pub onboard_date: i64,
-	pub status: String,
-	pub base_asset: String,
-	pub quote_asset: String,
-	pub margin_asset: String,
-	pub price_precision: u32,
-	pub quantity_precision: u32,
-	pub base_asset_precision: u32,
-	pub quote_precision: u32,
-	pub underlying_type: String,
-	pub underlying_sub_type: Vec<String>,
-	pub settle_plan: Option<u32>,
-	pub trigger_protect: String,
-	pub filters: Vec<Value>,
-	pub order_type: Option<Vec<String>>,
-	pub time_in_force: Vec<String>,
-	#[serde_as(as = "DisplayFromStr")]
-	pub liquidation_fee: f64,
-	#[serde_as(as = "DisplayFromStr")]
-	pub market_take_bound: f64,
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "filterType")]
 pub enum Filter {
@@ -196,6 +166,35 @@ pub struct PercentPriceFilter {
 	pub multiplier_decimal: u8,
 }
 
+#[serde_as]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FuturesSymbol {
+	pub symbol: String,
+	pub pair: String,
+	pub contract_type: String,
+	pub delivery_date: i64,
+	pub onboard_date: i64,
+	pub status: String,
+	pub base_asset: String,
+	pub quote_asset: String,
+	pub margin_asset: String,
+	pub price_precision: u32,
+	pub quantity_precision: u32,
+	pub base_asset_precision: u32,
+	pub quote_precision: u32,
+	pub underlying_type: String,
+	pub underlying_sub_type: Vec<String>,
+	pub settle_plan: Option<u32>,
+	pub trigger_protect: String,
+	pub filters: Vec<Value>,
+	pub order_type: Option<Vec<String>>,
+	pub time_in_force: Vec<String>,
+	#[serde_as(as = "DisplayFromStr")]
+	pub liquidation_fee: f64,
+	#[serde_as(as = "DisplayFromStr")]
+	pub market_take_bound: f64,
+}
 impl FuturesSymbol {
 	fn get_filter<T: for<'de> Deserialize<'de>>(&self, filter_type: &str) -> Option<T> {
 		self.filters.iter().find_map(|filter| {

discretionary_engine/src/positions.rs

@@ -108,19 +108,18 @@ impl PositionAcquisition {
 	}
 }
 
-#[derive(Clone, Debug, Default, derive_new::new)]
-pub struct PositionFollowup {
-	_acquisition: PositionAcquisition,
-	protocols_spec: Vec<Protocol>,
-	closed_notional: f64,
-}
-
 #[derive(Clone, Debug, derive_new::new)]
 pub struct HubToPosition {
 	pub sender: mpsc::Sender<ProtocolFills>,
 	pub position_id: Uuid,
 }
 
+#[derive(Clone, Debug, Default, derive_new::new)]
+pub struct PositionFollowup {
+	_acquisition: PositionAcquisition,
+	protocols_spec: Vec<Protocol>,
+	closed_notional: f64,
+}
 impl PositionFollowup {
 	#[instrument(skip(hub_tx, exchanges_arc))]
 	pub async fn do_followup(__acquisition: PositionAcquisition, protocols: Vec<Protocol>, hub_tx: mpsc::Sender<PositionToHub>, exchanges_arc: Arc<Exchanges>) -> Result<Self> {

discretionary_engine/src/protocols/mod.rs

@@ -44,23 +44,6 @@ pub enum Protocol {
 	ApproachingLimit(ApproachingLimitWrapper),
 	DummyMarket(DummyMarketWrapper),
 }
-impl FromStr for Protocol {
-	type Err = eyre::Report;
-
-	fn from_str(spec: &str) -> Result<Self> {
-		if let Ok(ts) = TrailingStopWrapper::from_str(spec) {
-			Ok(Protocol::TrailingStop(ts))
-		} else if let Ok(sar) = SarWrapper::from_str(spec) {
-			Ok(Protocol::Sar(sar))
-		} else if let Ok(al) = ApproachingLimitWrapper::from_str(spec) {
-			Ok(Protocol::ApproachingLimit(al))
-		} else if let Ok(dm) = DummyMarketWrapper::from_str(spec) {
-			Ok(Protocol::DummyMarket(dm))
-		} else {
-			bail!("Could not convert string to any Protocol\nString: {spec}")
-		}
-	}
-}
 impl Protocol {
 	pub fn attach(&self, position_set: &mut JoinSet<Result<()>>, tx_orders: mpsc::Sender<ProtocolOrders>, asset: String, protocol_side: Side) -> Result<()> {
 		match self {
@@ -107,6 +90,23 @@ impl Protocol {
 		}
 	}
 }
+impl FromStr for Protocol {
+	type Err = eyre::Report;
+
+	fn from_str(spec: &str) -> Result<Self> {
+		if let Ok(ts) = TrailingStopWrapper::from_str(spec) {
+			Ok(Protocol::TrailingStop(ts))
+		} else if let Ok(sar) = SarWrapper::from_str(spec) {
+			Ok(Protocol::Sar(sar))
+		} else if let Ok(al) = ApproachingLimitWrapper::from_str(spec) {
+			Ok(Protocol::ApproachingLimit(al))
+		} else if let Ok(dm) = DummyMarketWrapper::from_str(spec) {
+			Ok(Protocol::DummyMarket(dm))
+		} else {
+			bail!("Could not convert string to any Protocol\nString: {spec}")
+		}
+	}
+}
 
 #[derive(Clone, Debug, derive_new::new)]
 pub enum ProtocolParams {