chore: _

Author: valeratrades

v_exchanges/src/binance/mod.rs

@@ -3,7 +3,7 @@ mod futures;
 mod market;
 mod spot;
 use adapters::binance::BinanceOption;
-use derive_more::{Deref, DerefMut};
+use derive_more::{Deref, DerefMut, Display, FromStr};
 use eyre::Result;
 use v_exchanges_adapters::Client;
 use v_utils::trades::{Asset, Pair, Timeframe};
@@ -49,7 +49,7 @@ impl Exchange for Binance {
 	}
 }
 
-#[derive(Clone, Debug, Default, derive_new::new, Copy)]
+#[derive(Debug, Clone, Default, Copy, Display, FromStr)]
 pub enum Market {
 	#[default]
 	Futures,

v_exchanges/src/bybit/mod.rs

@@ -1,6 +1,7 @@
 mod account;
 mod market;
 
+use derive_more::{Display, FromStr};
 use adapters::bybit::BybitOption;
 use derive_more::derive::{Deref, DerefMut};
 use eyre::Result;
@@ -49,3 +50,12 @@ impl Exchange for Bybit {
 
 	//DO: async fn balance(&self,
 }
+
+
+#[derive(Debug, Clone, Default, Copy, Display, FromStr)]
+pub enum Market {
+	#[default]
+	Linear,
+	Spot,
+	Inverse,
+}

v_exchanges/src/core.rs

@@ -78,6 +78,7 @@ pub enum KlinesRequestRange {
 	/// Preferred way of defining the range
 	StartEnd { start: DateTime<Utc>, end: Option<DateTime<Utc>> },
 	/// For quick and dirty
+	//TODO!: have it contain an enum, with either exact value, either just `Max`, then each exchange matches on it
 	Limit(u32),
 }
 impl Default for KlinesRequestRange {

v_exchanges/src/lib.rs

@@ -10,3 +10,43 @@ pub use bybit::Bybit;
 
 pub mod bitmex;
 pub use bitmex::Bitmex;
+use eyre::Result;
+
+#[derive(Debug, Clone, Copy)]
+pub enum Market {
+	Binance(binance::Market),
+	Bybit(bybit::Market),
+	//TODO
+}
+impl Default for Market {
+	fn default() -> Self {
+		Self::Binance(binance::Market::default())
+	}
+}
+
+impl std::fmt::Display for Market {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			Market::Binance(m) => write!(f, "Binance/{}", m),
+			Market::Bybit(m) => write!(f, "Bybit/{}", m),
+		}
+	}
+}
+
+impl std::str::FromStr for Market {
+	type Err = eyre::Error;
+
+	fn from_str(s: &str) -> Result<Self> {
+		let parts: Vec<&str> = s.split('/').collect();
+		if parts.len() != 2 {
+			return Err(eyre::eyre!("Invalid market string: {}", s));
+		}
+		let market = parts[0];
+		let exchange = parts[1];
+		match market.to_lowercase().as_str() {
+			"binance" => Ok(Self::Binance(exchange.parse()?)),
+			"bybit" => Ok(Self::Bybit(exchange.parse()?)),
+			_ => Err(eyre::eyre!("Invalid market string: {}", s)),
+		}
+	}
+}