refactor: _

Author: valeratrades

Cargo.lock

@@ -16,21 +16,22 @@ v_utils = { version = "^2.0", path = "../v_utils/v_utils", features = ["trades",
 
 chrono = "^0.4.39"
 color-eyre = "^0.6.3"
-derive-new = "^0"
 futures-util = "^0.3.31"
 reqwest = { version = "^0.12.12", features = ["blocking", "json"] }
 serde = { version = "^1.0.217", features = ["derive"] }
 serde_plain = "^1.0.2" #TEST
 serde_json = "^1.0.134"
 serde_with = "^3.12.0"
 thiserror = "^2.0.9"
+derive_more = { version = "^1.0.0", features = ["deref", "deref_mut"] }
 tokio = { version = "^1.42.0", features = ["full"] }
 tokio-tungstenite = { version = "^0.26.1", features = ["native-tls"] }
 tracing = "^0.1.41"
 url = "^2.5.4"
 hmac = "^0.12.1"
 sha2 = "^0.10.8"
 hex = "^0.4.3"
+derive-new = "^0.7.0"
 
 #[dev-dependencies]
 insta = "1.41.1"

Cargo.toml

@@ -32,16 +32,14 @@ serde_with.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 thiserror.workspace = true
-v_exchanges_adapters = { version = "^0.1.1", path = "../v_exchanges_adapters/", features = ["full"] }
+derive_more.workspace = true
+derive-new.workspace = true
 v_utils = { workspace = true }
+
+v_exchanges_adapters = { version = "^0.1.1", path = "../v_exchanges_adapters/", features = ["full"] }
 chrono = "0.4.39"
-derive-new.workspace = true
 env_logger = "0.11.5"
 
-# #dbg
-rust_decimal = { version = "1.36.0", features = ["serde-with-str", "serde-with-float"] }
-derive_more = { version = "1.0.0", features = ["deref", "deref_mut"] }
-
 insta.workspace = true #dbg (for some reason is not loading in dev-dependencies rn
 
 [dev-dependencies]

v_exchanges/Cargo.toml

@@ -7,27 +7,17 @@ use color_eyre::eyre::{Report, eyre};
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use serde_with::{DisplayFromStr, serde_as};
-use v_exchanges_adapters::binance::{BinanceHttpUrl, BinanceOption};
+use v_exchanges_adapters::{
+	binance::{BinanceHttpUrl, BinanceOption},
+	errors::LimitOutOfRangeError,
+};
 use v_utils::{
 	trades::{Kline, Ohlc, Pair, Timeframe},
 	utils::filter_nulls,
 };
 
 use crate::core::{Klines, KlinesRequestRange};
 
-//MOVE: centralized error module
-#[derive(Debug)]
-struct LimitOutOfRangeError {
-	allowed: std::ops::RangeInclusive<u32>,
-	provided: u32,
-}
-impl fmt::Display for LimitOutOfRangeError {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(f, "Limit out of range. Allowed: {:?}, provided: {}", self.allowed, self.provided)
-	}
-}
-impl std::error::Error for LimitOutOfRangeError {}
-
 // klines {{{
 pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timeframe, range: KlinesRequestRange) -> Result<Klines> {
 	let range_json = match range {
@@ -38,11 +28,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 		KlinesRequestRange::Limit(limit) => {
 			let allowed_range = 1..=1000;
 			if !allowed_range.contains(&limit) {
-				return Err(LimitOutOfRangeError {
-					allowed: allowed_range,
-					provided: limit,
-				}
-				.into());
+				return Err(LimitOutOfRangeError::new(allowed_range, limit).into());
 			}
 			json!({
 				"limit": limit,

v_exchanges/src/binance/futures/market.rs

@@ -6,27 +6,17 @@ use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use serde_with::{DisplayFromStr, serde_as};
 use thiserror::Error;
-use v_exchanges_adapters::bybit::{BybitHttpUrl, BybitOption};
+use v_exchanges_adapters::{
+	bybit::{BybitHttpUrl, BybitOption},
+	errors::LimitOutOfRangeError,
+};
 use v_utils::{
 	trades::{Kline, Ohlc, Pair, Timeframe},
 	utils::filter_nulls,
 };
 
 use crate::core::{Klines, KlinesRequestRange};
 
-//MOVE: centralized error module
-#[derive(Debug)]
-struct LimitOutOfRangeError {
-	allowed: std::ops::RangeInclusive<u32>,
-	provided: u32,
-}
-impl fmt::Display for LimitOutOfRangeError {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(f, "Limit out of range. Allowed: {:?}, provided: {}", self.allowed, self.provided)
-	}
-}
-impl std::error::Error for LimitOutOfRangeError {}
-
 pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timeframe, range: KlinesRequestRange) -> Result<Klines> {
 	let range_json = match range {
 		KlinesRequestRange::StartEnd { start, end } => json!({
@@ -36,11 +26,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 		KlinesRequestRange::Limit(limit) => {
 			let allowed_range = 1..=1000;
 			if !allowed_range.contains(&limit) {
-				return Err(LimitOutOfRangeError {
-					allowed: allowed_range,
-					provided: limit,
-				}
-				.into());
+				return Err(LimitOutOfRangeError::new(allowed_range, limit).into());
 			}
 			json!({
 				"limit": limit,

v_exchanges/src/bybit/market.rs

@@ -1,4 +1,7 @@
 pub mod core;
 
 pub mod binance;
+pub use binance::Binance;
+
 pub mod bybit;
+pub use bybit::Bybit;

v_exchanges/src/lib.rs

@@ -40,6 +40,9 @@ serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
 sha2.workspace = true
+thiserror.workspace = true
+derive-new.workspace = true
+derive_more.workspace = true
 tracing.workspace = true
 v_exchanges_api_generics = { version = "^0.3.1", path = "../v_exchanges_api_generics" }
 rand = { version = "0.8.5", optional = true }

v_exchanges_adapters/Cargo.toml

@@ -0,0 +1,16 @@
+use std::fmt;
+
+use derive_more::Debug;
+use thiserror::Error;
+
+#[derive(Debug, derive_new::new)]
+pub struct LimitOutOfRangeError {
+	allowed: std::ops::RangeInclusive<u32>,
+	provided: u32,
+}
+impl fmt::Display for LimitOutOfRangeError {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "Limit out of range. Allowed: {:?}, provided: {}", self.allowed, self.provided)
+	}
+}
+impl std::error::Error for LimitOutOfRangeError {}

v_exchanges_adapters/src/errors/market.rs

@@ -0,0 +1,2 @@
+pub mod market;
+pub use market::*;

v_exchanges_adapters/src/errors/mod.rs

@@ -9,6 +9,7 @@ use v_exchanges_api_generics::{
 	websocket::*,
 };
 
+pub mod errors;
 mod exchanges;
 pub mod traits;