fix bugs

hangleang · Dec 31, 2024 · fadc052 · fadc052
1 parent e880d32
commit fadc052
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/eth2_libp2p b/eth2_libp2p
diff --git a/fork_choice_control/Cargo.toml b/fork_choice_control/Cargo.toml
@@ -52,6 +52,7 @@ types = { workspace = true }
 [dev-dependencies]
 bytesize = { workspace = true }
 duplicate = { workspace = true }
+eth2_cache_utils = { workspace = true }
 factory = { workspace = true }
 fs-err = { workspace = true }
 serde-aux = { workspace = true }

diff --git a/grandine/src/grandine_args.rs b/grandine/src/grandine_args.rs
@@ -503,6 +503,7 @@ struct NetworkConfigOptions {
 }
 
 impl NetworkConfigOptions {
+    #[expect(clippy::too_many_lines)]
     fn into_config(
         self,
         network: Network,

diff --git a/http_api/Cargo.toml b/http_api/Cargo.toml
@@ -63,6 +63,7 @@ database = { workspace = true }
 dedicated_executor = { workspace = true }
 deposit_tree = { workspace = true }
 eth1 = { workspace = true }
+eth2_cache_utils = { workspace = true }
 execution_engine = { workspace = true }
 factory = { workspace = true }
 fork_choice_store = { workspace = true }

diff --git a/http_api/src/standard.rs b/http_api/src/standard.rs
@@ -2781,7 +2781,6 @@ async fn publish_signed_block_with_data_column_sidecar<P: Preset, W: Wait>(
     Ok(status_code)
 }
 
-#[allow(clippy::too_many_arguments)]
 async fn publish_signed_block_v2<P: Preset, W: Wait>(
     block: Arc<SignedBeaconBlock<P>>,
     blob_sidecars: Vec<BlobSidecar<P>>,
@@ -2873,7 +2872,6 @@ async fn publish_signed_block_v2<P: Preset, W: Wait>(
 }
 
 // TODO(feature/das): merge with `publish_signed_block_v2`
-#[allow(clippy::too_many_arguments)]
 async fn publish_signed_block_v2_with_data_column_sidecar<P: Preset, W: Wait>(
     block: Arc<SignedBeaconBlock<P>>,
     data_column_sidecars: Vec<DataColumnSidecar<P>>,

diff --git a/operation_pools/Cargo.toml b/operation_pools/Cargo.toml
@@ -38,5 +38,8 @@ tynm = { workspace = true }
 typenum = { workspace = true }
 types = { workspace = true }
 
+[dev-dependencies]
+eth2_cache_utils = { workspace = true }
+
 [features]
 eth2-cache = []
diff --git a/p2p/src/network.rs b/p2p/src/network.rs
@@ -2199,7 +2199,7 @@ impl<P: Preset> Network<P> {
         self.request(peer_id, request_id, RequestType::DataColumnsByRoot(request));
     }
 
-    fn subscribe_to_core_topics(&mut self) {
+    fn subscribe_to_core_topics(&self) {
         // `subscribe_kind` locks `gossipsub_subscriptions` for writing.
         // Read current subscriptions before subscribing to avoid a deadlock.
         let subscribed_topics = self

diff --git a/validator/src/validator.rs b/validator/src/validator.rs
@@ -891,7 +891,7 @@ impl<P: Preset, W: Wait + Sync> Validator<P, W> {
                 } else {
                     for blob_sidecar in misc::construct_blob_sidecars(
                         &block,
-                        blobs.clone().into_iter(),
+                        blobs.into_iter(),
                         block_proofs.unwrap_or_default().into_iter(),
                     )? {
                         let blob_sidecar = Arc::new(blob_sidecar);
@@ -991,7 +991,7 @@ impl<P: Preset, W: Wait + Sync> Validator<P, W> {
                 ..
             } = own_attestation;
 
-            let committee_index = misc::committee_index(&attestation);
+            let committee_index = misc::committee_index(attestation);
 
             debug!(
                 "validator {} of committee {} ({:?}) attesting in slot {}: {:?}",
+87 −55		src/rpc/codec.rs
+12 −0		src/rpc/methods.rs
+2 −5		src/rpc/protocol.rs
+4 −1		tests/rpc_tests.rs