refactor: _

Author: valeratrades

Cargo.lock

@@ -10,15 +10,15 @@ async fn main() {
 
 	let mut client = Client::new();
 
-	//client.update_default_option(BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM));
-	//let klines = client.futures_klines(("BTC", "USDT").into(), "1m".into(), None, None, None).await.unwrap();
-	//let price = client.futures_price(("BTC", "USDT").into()).await.unwrap();
-	//dbg!(&klines);
+	client.update_default_option(BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM));
+	let klines = client.futures_klines(("BTC", "USDT").into(), "1m".into(), 2, None, None).await.unwrap();
+	let price = client.futures_price(("BTC", "USDT").into()).await.unwrap();
+	dbg!(&klines, price);
 
-	let key = env::var("BINANCE_TIGER_READ_KEY").unwrap();
-	let secret = env::var("BINANCE_TIGER_READ_SECRET").unwrap();
-	client.update_default_option(BinanceOption::Key(key));
-	client.update_default_option(BinanceOption::Secret(secret));
-	let balance = client.futures_asset_balance("USDT".into()).await.unwrap();
-	dbg!(&balance);
+	//let key = env::var("BINANCE_TIGER_READ_KEY").unwrap();
+	//let secret = env::var("BINANCE_TIGER_READ_SECRET").unwrap();
+	//client.update_default_option(BinanceOption::Key(key));
+	//client.update_default_option(BinanceOption::Secret(secret));
+	//let balance = client.futures_asset_balance("USDT".into()).await.unwrap();
+	//dbg!(&balance);
 }

v_exchanges/src/main.rs

@@ -78,7 +78,7 @@ impl Client {
 
 	/// see [http::Client::get()]
 	#[inline(always)]
-	pub async fn get<'a, R, O, Q>(&self, url: &str, query: Option<&Q>, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, ())
+	pub async fn get<'a, R, O, Q>(&self, url: &str, query: &Q, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, ())
 	where
 		O: HttpOption<'a, R, ()>,
 		O::RequestHandler: RequestHandler<()>,
@@ -99,7 +99,7 @@ impl Client {
 
 	/// see [http::Client::post()]
 	#[inline(always)]
-	pub async fn post<'a, R, O, B>(&self, url: &str, body: Option<B>, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, B)
+	pub async fn post<'a, R, O, B>(&self, url: &str, body: B, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, B)
 	where
 		O: HttpOption<'a, R, B>,
 		O::RequestHandler: RequestHandler<B>,
@@ -119,7 +119,7 @@ impl Client {
 
 	/// see [http::Client::put()]
 	#[inline(always)]
-	pub async fn put<'a, R, O, B>(&self, url: &str, body: Option<B>, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, B)
+	pub async fn put<'a, R, O, B>(&self, url: &str, body: B, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, B)
 	where
 		O: HttpOption<'a, R, B>,
 		O::RequestHandler: RequestHandler<B>,
@@ -139,7 +139,7 @@ impl Client {
 
 	/// see [http::Client::delete()]
 	#[inline(always)]
-	pub async fn delete<'a, R, O, Q>(&self, url: &str, query: Option<&Q>, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, ())
+	pub async fn delete<'a, R, O, Q>(&self, url: &str, query: &Q, options: impl IntoIterator<Item = O>) -> request_return_type!('a, R, O, ())
 	where
 		O: HttpOption<'a, R, ()>,
 		O::RequestHandler: RequestHandler<()>,

v_exchanges_adapters/src/lib.rs

@@ -81,11 +81,11 @@ impl Client {
 	///
 	/// For more information, see [request()][Self::request()].
 	#[inline(always)]
-	pub async fn get<Q, H>(&self, url: &str, query: Option<&Q>, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
+	pub async fn get<Q, H>(&self, url: &str, query: &Q, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
 	where
 		Q: Serialize + ?Sized,
 		H: RequestHandler<()>, {
-		self.request::<Q, (), H>(Method::GET, url, query, None, handler).await
+		self.request::<Q, (), H>(Method::GET, url, Some(query), None, handler).await
 	}
 
 	/// Makes an GET request with the given [RequestHandler], without queries.
@@ -107,10 +107,10 @@ impl Client {
 	///
 	/// For more information, see [request()][Self::request()].
 	#[inline(always)]
-	pub async fn post<B, H>(&self, url: &str, body: Option<B>, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
+	pub async fn post<B, H>(&self, url: &str, body: B, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
 	where
 		H: RequestHandler<B>, {
-		self.request::<(), B, H>(Method::POST, url, None, body, handler).await
+		self.request::<(), B, H>(Method::POST, url, None, Some(body), handler).await
 	}
 
 	/// Makes an POST request with the given [RequestHandler], without a body.
@@ -132,10 +132,10 @@ impl Client {
 	///
 	/// For more information, see [request()][Self::request()].
 	#[inline(always)]
-	pub async fn put<B, H>(&self, url: &str, body: Option<B>, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
+	pub async fn put<B, H>(&self, url: &str, body: B, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
 	where
 		H: RequestHandler<B>, {
-		self.request::<(), B, H>(Method::PUT, url, None, body, handler).await
+		self.request::<(), B, H>(Method::PUT, url, None, Some(body), handler).await
 	}
 
 	/// Makes an PUT request with the given [RequestHandler], without a body.
@@ -158,11 +158,11 @@ impl Client {
 	///
 	/// For more information, see [request()][Self::request()].
 	#[inline(always)]
-	pub async fn delete<Q, H>(&self, url: &str, query: Option<&Q>, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
+	pub async fn delete<Q, H>(&self, url: &str, query: &Q, handler: &H) -> Result<H::Successful, RequestError<H::BuildError, H::Unsuccessful>>
 	where
 		Q: Serialize + ?Sized,
 		H: RequestHandler<()>, {
-		self.request::<Q, (), H>(Method::DELETE, url, query, None, handler).await
+		self.request::<Q, (), H>(Method::DELETE, url, Some(query), None, handler).await
 	}
 
 	/// Makes an DELETE request with the given [RequestHandler], without queries.

v_exchanges_api_generics/src/http.rs

@@ -5,21 +5,24 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use serde_with::{DisplayFromStr, serde_as};
 use v_exchanges_adapters::binance::{BinanceHttpUrl, BinanceOption};
-use v_utils::trades::{Kline, Ohlc, Pair, Timeframe};
+use v_utils::{
+	trades::{Kline, Ohlc, Pair, Timeframe},
+	utils::filter_nulls,
+};
 
 use crate::core::Klines;
 
 // klines {{{
-pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timeframe, limit: Option<u32>, start_time: Option<u64>, end_time: Option<u64>) -> Result<Klines> {
-	let params = json!({
+pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timeframe, limit: u32, start_time: Option<u64>, end_time: Option<u64>) -> Result<Klines> {
+	let mut params = filter_nulls(json!({
 		"symbol": pair.to_string(),
 		"interval": tf.format_binance()?,
 		"limit": limit,
 		"startTime": start_time,
 		"endTime": end_time,
-	});
+	}));
 
-	let kline_responses: Vec<KlineResponse> = client.get("/fapi/v1/klines", Some(&params), [BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM)]).await.unwrap();
+	let kline_responses: Vec<KlineResponse> = client.get("/fapi/v1/klines", &params, [BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM)]).await.unwrap();
 	let klines: Vec<Kline> = kline_responses.into_iter().map(Kline::from).collect();
 
 	Ok(Klines { v: klines, tf, oi: Vec::new() })
@@ -78,16 +81,11 @@ impl From<KlineResponse> for Kline {
 // price {{{
 //HACK: not sure this is _the_ thing to use for that (throwing away A LOT of data)
 pub async fn price(client: &v_exchanges_adapters::Client, pair: Pair) -> Result<f64> {
-	#[derive(Serialize)]
-	pub struct PriceParams {
-		pub symbol: String,
-	}
-	let mut params = PriceParams { symbol: pair.to_string() };
+	let mut params = json!({
+		"symbol": pair.to_string(),
+	});
 
-	let r: MarkPriceResponse = client
-		.get("/fapi/v1/premiumIndex", Some(&params), [BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM)])
-		.await
-		.unwrap();
+	let r: MarkPriceResponse = client.get("/fapi/v1/premiumIndex", &params, [BinanceOption::HttpUrl(BinanceHttpUrl::FuturesUsdM)]).await.unwrap();
 	let price = r.index_price; // when using this framework, we care for per-exchange price, obviously
 	Ok(price)
 }

v_exchanges_deser/src/binance/futures/market.rs

@@ -8,7 +8,7 @@ use crate::core::{AssetBalance, Exchange, Klines};
 
 //? 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?
 impl Exchange<binance::BinanceOptions> for Client {
-	async fn futures_klines(&self, symbol: Pair, tf: Timeframe, limit: Option<u32>, start_time: Option<u64>, end_time: Option<u64>) -> Result<Klines> {
+	async fn futures_klines(&self, symbol: Pair, tf: Timeframe, limit: u32, start_time: Option<u64>, end_time: Option<u64>) -> Result<Klines> {
 		futures::market::klines(&self, symbol, tf, limit, start_time, end_time).await
 	}
 

v_exchanges_deser/src/binance/mod.rs

@@ -6,7 +6,7 @@ use v_utils::trades::{Asset, Kline, Pair, Timeframe};
 
 pub trait Exchange<O: HandlerOptions> {
 	//? should I have Self::Pair too? Like to catch the non-existent ones immediately? Although this would increase the error surface on new listings.
-	fn futures_klines(&self, symbol: Pair, tf: Timeframe, limit: Option<u32>, start_time: Option<u64>, end_time: Option<u64>) -> impl std::future::Future<Output = Result<Klines>> + Send;
+	fn futures_klines(&self, symbol: Pair, tf: Timeframe, limit: u32, start_time: Option<u64>, end_time: Option<u64>) -> impl std::future::Future<Output = Result<Klines>> + Send;
 	fn futures_price(&self, symbol: Pair) -> impl std::future::Future<Output = Result<f64>> + Send;
 
 	// Defined in terms of actors