From f59f8812ccbec4ee0f87f6b159da59fb5b97ff7e Mon Sep 17 00:00:00 2001 From: realbigsean Date: Mon, 18 Mar 2024 17:37:37 -0400 Subject: [PATCH 1/2] de dup parent blob requests --- .../network/src/sync/block_lookups/mod.rs | 2 +- .../network/src/sync/block_lookups/tests.rs | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs index 62cdc4fa223..2327abc61b0 100644 --- a/beacon_node/network/src/sync/block_lookups/mod.rs +++ b/beacon_node/network/src/sync/block_lookups/mod.rs @@ -217,7 +217,7 @@ impl BlockLookups { // Make sure this block is not already downloaded, and that neither it or its parent is // being searched for. if let Some(parent_lookup) = self.parent_lookups.iter_mut().find(|parent_req| { - parent_req.contains_block(&block_root) || parent_req.is_for_block(block_root) + parent_req.contains_block(&parent_root) || parent_req.is_for_block(parent_root) }) { parent_lookup.add_peer(peer_id); // we are already searching for this block, ignore it diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs index c506696b9d3..32660355f42 100644 --- a/beacon_node/network/src/sync/block_lookups/tests.rs +++ b/beacon_node/network/src/sync/block_lookups/tests.rs @@ -1625,6 +1625,16 @@ mod deneb_only { self.rig.expect_block_process(ResponseType::Block); self } + fn search_parent_dup(mut self) -> Self { + self.bl.search_parent( + self.slot, + self.block_root, + self.block.parent_root(), + self.peer_id, + &mut self.cx, + ); + self + } } fn get_fork_name() -> ForkName { @@ -2088,4 +2098,31 @@ mod deneb_only { .expect_no_penalty() .expect_block_process(); } + + #[test] + fn unknown_parent_block_dup() { + let Some(tester) = + DenebTester::new(RequestTrigger::GossipUnknownParentBlock { num_parents: 1 }) + else { + return; + }; + + tester + .search_parent_dup() + .expect_no_blobs_request() + .expect_no_block_request(); + } + #[test] + fn unknown_parent_blob_dup() { + let Some(tester) = + DenebTester::new(RequestTrigger::GossipUnknownParentBlob { num_parents: 1 }) + else { + return; + }; + + tester + .search_parent_dup() + .expect_no_blobs_request() + .expect_no_block_request(); + } } From 3e7a57fd18d2621101f9c6f3ba766e6e58039da3 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Mon, 18 Mar 2024 19:24:07 -0400 Subject: [PATCH 2/2] add new line --- beacon_node/network/src/sync/block_lookups/tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs index 32660355f42..d327c5c905a 100644 --- a/beacon_node/network/src/sync/block_lookups/tests.rs +++ b/beacon_node/network/src/sync/block_lookups/tests.rs @@ -2112,6 +2112,7 @@ mod deneb_only { .expect_no_blobs_request() .expect_no_block_request(); } + #[test] fn unknown_parent_blob_dup() { let Some(tester) =