From 801659d4ae200600305787e0538b6ba0559ac98e Mon Sep 17 00:00:00 2001 From: dapplion <35266934+dapplion@users.noreply.github.com> Date: Thu, 22 May 2025 01:06:57 -0500 Subject: [PATCH] Resolve some TODOs --- .../src/sync/network_context/block_components_by_range.rs | 2 -- .../network/src/sync/network_context/custody_by_range.rs | 3 +-- .../network/src/sync/network_context/custody_by_root.rs | 5 +---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/beacon_node/network/src/sync/network_context/block_components_by_range.rs b/beacon_node/network/src/sync/network_context/block_components_by_range.rs index 4545806a05..45e5091665 100644 --- a/beacon_node/network/src/sync/network_context/block_components_by_range.rs +++ b/beacon_node/network/src/sync/network_context/block_components_by_range.rs @@ -191,7 +191,6 @@ impl BlockComponentsByRangeRequest { blocks_by_range_request, } => { if let Some((blocks, block_peer)) = blocks_by_range_request.to_finished() { - // TODO(das): use the peer group let peer_group = BatchPeers::new_from_block_peer(*block_peer); let rpc_blocks = couple_blocks_base( blocks.to_vec(), @@ -226,7 +225,6 @@ impl BlockComponentsByRangeRequest { blocks_by_range_request, } => { if let Some((blocks, block_peer)) = blocks_by_range_request.to_finished() { - // TODO(das): use the peer group let blocks_with_data = blocks .iter() .filter(|block| block.has_data()) diff --git a/beacon_node/network/src/sync/network_context/custody_by_range.rs b/beacon_node/network/src/sync/network_context/custody_by_range.rs index 9f8e163ba4..22d0d02d98 100644 --- a/beacon_node/network/src/sync/network_context/custody_by_range.rs +++ b/beacon_node/network/src/sync/network_context/custody_by_range.rs @@ -425,8 +425,7 @@ impl ActiveCustodyByRangeRequest { // - Add a new peer that custodies the missing columns // - Call `continue_requests` // - // Otherwise this request should be dropped and failed after some time. - // TODO(das): implement the above + // Otherwise this request will be dropped and failed after some time. } } } diff --git a/beacon_node/network/src/sync/network_context/custody_by_root.rs b/beacon_node/network/src/sync/network_context/custody_by_root.rs index c547837fc7..3b7b373790 100644 --- a/beacon_node/network/src/sync/network_context/custody_by_root.rs +++ b/beacon_node/network/src/sync/network_context/custody_by_root.rs @@ -249,7 +249,6 @@ impl ActiveCustodyByRootRequest { let active_request_count_by_peer = cx.active_request_count_by_peer(); let mut columns_to_request_by_peer = HashMap::>::new(); let lookup_peers = self.lookup_peers.read(); - let mut indices_without_peers = vec![]; // Need to: // - track how many active requests a peer has for load balancing @@ -304,9 +303,7 @@ impl ActiveCustodyByRootRequest { // - Add a new peer that custodies the missing columns // - Call `continue_requests` // - // Otherwise this request should be dropped and failed after some time. - // TODO(das): implement the above - indices_without_peers.push(column_index); + // Otherwise this request will be dropped and failed after some time. } } }