Add suggestions

Cargo.lock

@@ -2099,6 +2099,7 @@ version = "0.1.0"
 dependencies = [
  "account_utils",
  "bytes",
+ "derivative",
  "eth2_keystore",
  "ethereum_serde_utils",
  "ethereum_ssz",

common/eth2/Cargo.toml

@@ -31,6 +31,7 @@ slashing_protection = { workspace = true }
 mediatype = "0.19.13"
 mime = "0.3.16"
 pretty_reqwest_error = { workspace = true }
+derivative = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }

common/eth2/src/lib.rs

@@ -16,6 +16,7 @@ pub mod types;
 
 use self::mixin::{RequestAccept, ResponseOptional};
 use self::types::{Error as ResponseError, *};
+use derivative::Derivative;
 use futures::Stream;
 use futures_util::StreamExt;
 use lighthouse_network::PeerId;
@@ -143,19 +144,15 @@ impl Timeouts {
 
 /// A wrapper around `reqwest::Client` which provides convenience methods for interfacing with a
 /// Lighthouse Beacon Node HTTP server (`http_api`).
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Derivative)]
+#[derivative(PartialEq)]
 pub struct BeaconNodeHttpClient {
+    #[derivative(PartialEq = "ignore")]
     client: reqwest::Client,
     server: SensitiveUrl,
     timeouts: Timeouts,
 }
 
-impl PartialEq for BeaconNodeHttpClient {
-    fn eq(&self, other: &Self) -> bool {
-        self.server == other.server && self.timeouts == other.timeouts
-    }
-}
-
 impl Eq for BeaconNodeHttpClient {}
 
 impl fmt::Display for BeaconNodeHttpClient {

validator_client/src/lib.rs

@@ -342,15 +342,15 @@ impl<T: EthSpec> ProductionValidatorClient<T> {
 
         let candidates = beacon_nodes
             .into_iter()
-            .zip(0..num_nodes)
+            .enumerate()
-            .map(|(node, id)| CandidateBeaconNode::new(node, id))
+            .map(|(id, node)| CandidateBeaconNode::new(node, id))
             .collect();
 
         let proposer_nodes_num = proposer_nodes.len();
         let proposer_candidates = proposer_nodes
             .into_iter()
-            .zip(0..num_nodes)
+            .enumerate()
-            .map(|(node, id)| CandidateBeaconNode::new(node, id))
+            .map(|(id, node)| CandidateBeaconNode::new(node, id))
             .collect();
 
         // Set the count for beacon node fallbacks excluding the primary beacon node.