refactor: _

Author: valeratrades

README.md

@@ -2,7 +2,7 @@
 ![Minimum Supported Rust Version](https://img.shields.io/badge/nightly-1.85+-ab6000.svg)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/v_exchanges.svg?color=fc8d62&logo=rust" height="20" style=flat-square>](https://crates.io/crates/v_exchanges)
 [<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs&style=flat-square" height="20">](https://docs.rs/v_exchanges)
-![Lines Of Code](https://img.shields.io/badge/LoC-3864-lightblue)
+![Lines Of Code](https://img.shields.io/badge/LoC-3894-lightblue)
 <br>
 [<img alt="ci errors" src="https://img.shields.io/github/actions/workflow/status/valeratrades/v_exchanges/errors.yml?branch=master&style=for-the-badge&style=flat-square&label=errors&labelColor=420d09" height="20">](https://github.com/valeratrades/v_exchanges/actions?query=branch%3Amaster) <!--NB: Won't find it if repo is private-->
 [<img alt="ci warnings" src="https://img.shields.io/github/actions/workflow/status/valeratrades/v_exchanges/warnings.yml?branch=master&style=for-the-badge&style=flat-square&label=warnings&labelColor=d16002" height="20">](https://github.com/valeratrades/v_exchanges/actions?query=branch%3Amaster) <!--NB: Won't find it if repo is private-->

examples/binance/market_futures.rs

@@ -1,8 +1,6 @@
 use std::env;
 
-use v_exchanges::{
-	prelude::*,
-};
+use v_exchanges::prelude::*;
 
 #[tokio::main]
 async fn main() {
@@ -12,6 +10,8 @@ async fn main() {
 	let m: AbsMarket = "Binance/Futures".into();
 	let mut c = m.client();
 
+	println!("m: {m}");
+
 	let exchange_info = c.exchange_info(m).await.unwrap();
 	dbg!(&exchange_info.pairs.iter().take(2).collect::<Vec<_>>());
 

v_exchanges/src/binance/data.rs

@@ -38,7 +38,7 @@ impl Binance {
 		});
 		let params = join_params(base_json, range_json);
 		let r: serde_json::Value = self
-			.0
+			.client
 			.get(&format!("/futures/data/{ending}"), &params, [BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM)])
 			.await?;
 		let r: Vec<LsrResponse> = serde_json::from_value(r).unwrap();

v_exchanges/src/binance/mod.rs

@@ -11,13 +11,22 @@ use v_utils::trades::{Asset, Pair, Timeframe};
 use crate::core::{AbsMarket, AssetBalance, Exchange, ExchangeInfo, Klines, RequestRange, WrongExchangeError};
 
 #[derive(Clone, Debug, Default, Deref, DerefMut)]
-pub struct Binance(pub Client);
+pub struct Binance {
+	#[deref_mut]
+	#[deref]
+	client: Client,
+	source_market: AbsMarket,
+}
 
 //? currently client ends up importing this from crate::binance, but could it be possible to lift the [Client] reexport up, and still have the ability to call all exchange methods right on it?
 #[async_trait::async_trait]
 impl Exchange for Binance {
+	fn source_market(&self) -> AbsMarket {
+		self.source_market
+	}
+
 	fn exchange_name(&self) -> &'static str {
-		"Binance"
+		self.source_market().exchange_name()
 	}
 
 	fn auth(&mut self, key: String, secret: String) {
@@ -28,7 +37,7 @@ impl Exchange for Binance {
 	async fn exchange_info(&self, am: AbsMarket) -> Result<ExchangeInfo> {
 		match am {
 			AbsMarket::Binance(m) => match m {
-				Market::Futures => futures::general::exchange_info(&self.0).await,
+				Market::Futures => futures::general::exchange_info(&self.client).await,
 				_ => unimplemented!(),
 			},
 			_ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -37,15 +46,15 @@ impl Exchange for Binance {
 
 	async fn klines(&self, pair: Pair, tf: Timeframe, range: RequestRange, am: AbsMarket) -> Result<Klines> {
 		match am {
-			AbsMarket::Binance(m) => market::klines(&self.0, pair, tf, range, m).await,
+			AbsMarket::Binance(m) => market::klines(&self.client, pair, tf, range, m).await,
 			_ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
 		}
 	}
 
 	async fn prices(&self, pairs: Option<Vec<Pair>>, am: AbsMarket) -> Result<Vec<(Pair, f64)>> {
 		match am {
 			AbsMarket::Binance(m) => match m {
-				Market::Spot => spot::market::prices(&self.0, pairs).await,
+				Market::Spot => spot::market::prices(&self.client, pairs).await,
 				_ => unimplemented!(),
 			},
 			_ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -55,8 +64,8 @@ impl Exchange for Binance {
 	async fn price(&self, pair: Pair, am: AbsMarket) -> Result<f64> {
 		match am {
 			AbsMarket::Binance(m) => match m {
-				Market::Spot => spot::market::price(&self.0, pair).await,
-				Market::Futures => futures::market::price(&self.0, pair).await,
+				Market::Spot => spot::market::price(&self.client, pair).await,
+				Market::Futures => futures::market::price(&self.client, pair).await,
 				_ => unimplemented!(),
 			},
 			_ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -76,7 +85,7 @@ impl Exchange for Binance {
 	async fn balances(&self, am: AbsMarket) -> Result<Vec<AssetBalance>> {
 		match am {
 			AbsMarket::Binance(m) => match m {
-				Market::Futures => futures::account::balances(&self.0).await,
+				Market::Futures => futures::account::balances(&self.client).await,
 				_ => unimplemented!(),
 			},
 			_ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),

v_exchanges/src/bybit/mod.rs

@@ -13,13 +13,21 @@ use v_utils::trades::{Asset, Pair, Timeframe};
 use crate::core::{AbsMarket, AssetBalance, Exchange, ExchangeInfo, Klines, RequestRange, WrongExchangeError};
 
 #[derive(Clone, Debug, Default, Deref, DerefMut)]
-pub struct Bybit(pub Client);
+pub struct Bybit {
+    #[deref_mut]
+    #[deref]
+    client: Client,
+    source_market: AbsMarket,
+}
 
 //? currently client ends up importing this from crate::binance, but could it be possible to lift the [Client] reexport up, and still have the ability to call all exchange methods right on it?
 #[async_trait::async_trait]
 impl Exchange for Bybit {
+    fn source_market(&self) -> AbsMarket {
+        todo!()
+    }
     fn exchange_name(&self) -> &'static str {
-        "Bybit"
+        self.source_market().exchange_name()
     }
 
     fn auth(&mut self, key: String, secret: String) {
@@ -37,7 +45,7 @@ impl Exchange for Bybit {
     async fn klines(&self, pair: Pair, tf: Timeframe, range: RequestRange, am: AbsMarket) -> Result<Klines> {
         match am {
             AbsMarket::Bybit(m) => match m {
-                Market::Linear => market::klines(&self.0, pair, tf, range).await,
+                Market::Linear => market::klines(&self.client, pair, tf, range).await,
                 _ => unimplemented!(),
             },
             _ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -47,7 +55,7 @@ impl Exchange for Bybit {
     async fn price(&self, pair: Pair, am: AbsMarket) -> Result<f64> {
         match am {
             AbsMarket::Bybit(m) => match m {
-                Market::Linear => market::price(&self.0, pair).await,
+                Market::Linear => market::price(&self.client, pair).await,
                 _ => unimplemented!(),
             },
             _ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -64,7 +72,7 @@ impl Exchange for Bybit {
     async fn asset_balance(&self, asset: Asset, am: AbsMarket) -> Result<AssetBalance> {
         match am {
             AbsMarket::Bybit(m) => match m {
-                Market::Linear => account::asset_balance(&self.0, asset).await,
+                Market::Linear => account::asset_balance(&self.client, asset).await,
                 _ => unimplemented!(),
             },
             _ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),
@@ -74,7 +82,7 @@ impl Exchange for Bybit {
     async fn balances(&self, am: AbsMarket) -> Result<Vec<AssetBalance>> {
         match am {
             AbsMarket::Bybit(m) => match m {
-                Market::Linear => account::balances(&self.0).await,
+                Market::Linear => account::balances(&self.client).await,
                 _ => unimplemented!()
             },
             _ => Err(WrongExchangeError::new(self.exchange_name(), am).into()),

v_exchanges/src/core.rs

@@ -12,6 +12,7 @@ use v_utils::{
 //TODO!!!!!!!!!!!!!: klines switch to defining the range via an Enum over either limit either start and end times
 #[async_trait::async_trait]
 pub trait Exchange: std::fmt::Debug {
+	fn source_market(&self) -> AbsMarket;
 	fn exchange_name(&self) -> &'static str;
 	fn auth(&mut self, key: String, secret: String);
 
@@ -57,7 +58,7 @@ pub trait MarketTrait {
 	//TODO; require them to impl Display and FromStr
 }
 
-#[derive(Debug, Clone, Copy, derive_more::Display/*TODO:, derive_more::FromStr*/)]
+#[derive(Debug, Clone, Copy)]
 pub enum AbsMarket {
 	Binance(crate::binance::Market),
 	Bybit(crate::bybit::Market),
@@ -70,21 +71,27 @@ impl AbsMarket {
 			Self::Bybit(m) => m.client(),
 		}
 	}
+	pub fn exchange_name(&self) -> &'static str {
+		match self {
+			Self::Binance(_) => "Binance",
+			Self::Bybit(_) => "Bybit",
+		}
+	}
 }
 impl Default for AbsMarket {
 	fn default() -> Self {
 		Self::Binance(crate::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::fmt::Display for AbsMarket {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		match self {
+			Self::Binance(m) => write!(f, "Binance/{}", m),
+			Self::Bybit(m) => write!(f, "Bybit/{}", m),
+		}
+	}
+}
+
 impl std::str::FromStr for AbsMarket {
 	type Err = eyre::Error;