feat: generalize RequestConfig itself

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-4861-lightblue)
+![Lines Of Code](https://img.shields.io/badge/LoC-4851-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-->

v_exchanges_adapters/src/exchanges/binance.rs

@@ -172,10 +172,8 @@ where
 	type Successful = R;
 	type Unsuccessful = BinanceHandlerError;
 
-	fn patch_request_config(&self, config: &mut RequestConfig) {
-		if self.options.http_url == BinanceHttpUrl::default() {
-			config.url_prefix = self.options.http_url.as_str().to_owned();
-		}
+	fn base_url(&self) -> String {
+		self.options.http_url.as_str().to_owned()
 	}
 
 	#[tracing::instrument(skip_all, fields(?builder))]

v_exchanges_adapters/src/exchanges/bitflyer.rs

@@ -125,10 +125,8 @@ where
 	type Successful = R;
 	type Unsuccessful = BitFlyerHandlerError;
 
-	fn patch_request_config(&self, config: &mut RequestConfig) {
-		if self.options.http_url != BitFlyerHttpUrl::default() {
-			config.url_prefix = self.options.http_url.as_str().to_owned();
-		}
+	fn base_url(&self) -> String {
+		self.options.http_url.as_str().to_owned()
 	}
 
 	fn build_request(&self, mut builder: RequestBuilder, request_body: &Option<B>, _: u8) -> Result<Request, Self::BuildError> {

v_exchanges_adapters/src/exchanges/bybit.rs

@@ -148,10 +148,8 @@ where
 	type Successful = R;
 	type Unsuccessful = BybitHandlerError;
 
-	fn patch_request_config(&self, config: &mut RequestConfig) {
-		if self.options.http_url != BybitHttpUrl::default() {
-			config.url_prefix = self.options.http_url.as_str().to_owned();
-		}
+	fn base_url(&self) -> String {
+		self.options.http_url.as_str().to_owned()
 	}
 
 	fn build_request(&self, mut builder: RequestBuilder, request_body: &Option<B>, _: u8) -> Result<Request, Self::BuildError> {

v_exchanges_adapters/src/exchanges/coincheck.rs

@@ -115,10 +115,8 @@ where
 	type Successful = R;
 	type Unsuccessful = CoincheckHandlerError;
 
-	fn patch_request_config(&self, config: &mut RequestConfig) {
-		if self.options.http_url != CoincheckHttpUrl::default() {
-			config.url_prefix = self.options.http_url.as_str().to_owned();
-		}
+	fn base_url(&self) -> String {
+		self.options.http_url.as_str().to_owned()
 	}
 
 	fn build_request(&self, mut builder: RequestBuilder, request_body: &Option<B>, _: u8) -> Result<Request, Self::BuildError> {

v_exchanges_adapters/src/exchanges/mexc.rs

@@ -150,10 +150,8 @@ where
 	type Successful = R;
 	type Unsuccessful = MexcHandlerError;
 
-	fn patch_request_config(&self, config: &mut RequestConfig) {
-		if self.options.http_url != MexcHttpUrl::default() {
-			config.url_prefix = self.options.http_url.as_str().to_owned();
-		}
+	fn base_url(&self) -> String {
+		self.options.http_url.as_str().to_owned()
 	}
 
 	#[tracing::instrument(skip_all, fields(?builder))]

v_exchanges_api_generics/src/http.rs

@@ -40,11 +40,12 @@ impl Client {
 	where
 		Q: Serialize + ?Sized + std::fmt::Debug,
 		H: RequestHandler<B>, {
-		let mut config = self.config.clone();
-		handler.patch_request_config(&mut config);
+		let config = &self.config;
+		let base_url = handler.base_url();
 		config.verify();
 
-		let url = config.url_prefix + url;
+		//Q: is it ever desirable, actually?
+		let url = base_url + url;
 
 		for i in 1..=config.max_try {
 			//HACK: hate to create a new request every time, but I haven't yet figured out how to provide by reference
@@ -195,9 +196,10 @@ pub trait RequestHandler<B> {
 	/// The type that represents an error occurred in [build_request()][Self::build_request()].
 	type BuildError;
 
-	/// Returns a [RequestConfig] that will be used to send a HTTP reqeust.
-	//TODO!!!!: everyone has the exact same implementation of this, unify (would req a trait for default REST url)
-	fn patch_request_config(&self, default: &mut RequestConfig) {}
+	/// Produce a url prefix (if any).
+	fn base_url(&self) -> String {
+		String::default()
+	}
 
 	/// Build a HTTP request to be sent.
 	///
@@ -246,10 +248,6 @@ pub struct RequestConfig {
 	/// It is possible for the [RequestHandler] to override this in [RequestHandler::build_request()].
 	/// See also: [RequestBuilder::timeout()].
 	pub timeout: Duration,
-	/// The prefix which will be used for requests sent using this configuration. [Default]s to `""`.
-	///
-	/// Example usage: `"https://example.com"`
-	pub url_prefix: String,
 }
 
 impl RequestConfig {
@@ -271,7 +269,6 @@ impl Default for RequestConfig {
 			max_try: 1,
 			retry_cooldown: Duration::from_millis(500),
 			timeout: Duration::from_secs(3),
-			url_prefix: String::new(),
 		}
 	}
 }