use typed builder

Cargo.toml

@@ -25,6 +25,7 @@ arbitrary = { git = "https://github.com/michaelsproul/arbitrary", rev="a572fd874
 ethereum-types = { version = "0.14.1", default-features = false }
 funty = "2.0.0"
 anyhow = "1.0"
+typed-builder = "0.16.0"
 log = { version = "0.4", default-features = false }
 serde_json = { version = "1.0.74", default-features = false }
 serde = { version = "1.0", features = ["derive"], default-features = false }

crates/eth-rpc-client/src/beacon_rpc_client.rs

@@ -96,14 +96,22 @@ impl BeaconRPCClient {
 			.build()
 			.expect("Error on building non-blocking client for regular rpc requests.");
 
-		let retry_client = WebbRetryClient::new(client, u32::MAX, 3000);
+		let retry_client = WebbRetryClient::builder()
+			.inner(client)
+			.timeout_retries(u32::MAX)
+			.initial_backoff(3000_u64)
+			.build();
 
 		let state_client = reqwest::Client::builder()
 			.timeout(Duration::from_secs(timeout_state_seconds))
 			.build()
 			.expect("Error on building non-blocking client for regular rpc requests.");
 
-		let retry_state_client = WebbRetryClient::new(state_client, u32::MAX, 3000);
+		let retry_state_client = WebbRetryClient::builder()
+			.inner(state_client)
+			.timeout_retries(u32::MAX)
+			.initial_backoff(3000_u64)
+			.build();
 
 		Self {
 			endpoint_url: endpoint_url.to_string(),

crates/lc-relay-types/Cargo.toml

@@ -14,4 +14,5 @@ anyhow = { workspace = true }
 webb = { workspace = true}
 tracing = { workspace = true }
 backoff = { workspace = true }
-tokio = { workspace = true }
+tokio = { workspace = true }
+typed-builder = { workspace = true }

crates/lc-relay-types/src/lib.rs

@@ -1,34 +1,37 @@
 use reqwest::Client;
 use std::time::Duration;
 
-#[derive(Debug)]
+#[derive(Debug, Clone, typed_builder::TypedBuilder)]
 pub struct WebbRetryClient {
 	/// The inner client
+	#[builder(setter(into))]
 	inner: Client,
 	/// How many connection `TimedOut` should be retried.
+	#[builder(setter(into))]
 	timeout_retries: u32,
 	/// How long to wait initially
+	#[builder(setter(into))]
 	initial_backoff: u64,
 }
 
-impl WebbRetryClient {
-	pub fn new(inner: Client, timeout_retries: u32, initial_backoff: u64) -> Self {
-		Self { inner, timeout_retries, initial_backoff }
-	}
-	/// Sets the number of retries after a connection times out
-	///
-	/// **Note:** this will only be used for `request::Error::TimedOut`
-	pub fn timeout_retries(mut self, timeout_retries: u32) -> Self {
-		self.timeout_retries = timeout_retries;
-		self
-	}
+// impl WebbRetryClient {
+// 	pub fn new(inner: Client, timeout_retries: u32, initial_backoff: u64) -> Self {
+// 		Self { inner, timeout_retries, initial_backoff }
+// 	}
+// 	/// Sets the number of retries after a connection times out
+// 	///
+// 	/// **Note:** this will only be used for `request::Error::TimedOut`
+// 	pub fn timeout_retries(mut self, timeout_retries: u32) -> Self {
+// 		self.timeout_retries = timeout_retries;
+// 		self
+// 	}
 
-	/// Sets the duration to wait initially before retrying
-	pub fn initial_backoff(mut self, initial_backoff: u64) -> Self {
-		self.initial_backoff = initial_backoff;
-		self
-	}
-}
+// 	/// Sets the duration to wait initially before retrying
+// 	pub fn initial_backoff(mut self, initial_backoff: u64) -> Self {
+// 		self.initial_backoff = initial_backoff;
+// 		self
+// 	}
+// }
 
 impl WebbRetryClient {
 	pub async fn get(&self, url: &str) -> anyhow::Result<String> {