diff --git a/beacon_node/beacon_processor/src/lib.rs b/beacon_node/beacon_processor/src/lib.rs index 561fa16f03..d6233ebaf9 100644 --- a/beacon_node/beacon_processor/src/lib.rs +++ b/beacon_node/beacon_processor/src/lib.rs @@ -424,8 +424,6 @@ pub enum Work { process_fn: AsyncFn, }, RpcCustodyColumn(AsyncFn), - /// An execution payload envelope fetched via RPC for a single-block lookup. Shares the - /// `rpc_blob_queue` for scheduling (similar latency/priority profile). RpcEnvelope(AsyncFn), ColumnReconstruction(AsyncFn), IgnoredRpcBlock { diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs index 61b2cfef32..c656aab4ad 100644 --- a/beacon_node/network/src/sync/block_lookups/mod.rs +++ b/beacon_node/network/src/sync/block_lookups/mod.rs @@ -459,7 +459,7 @@ impl BlockLookups { let Some(lookup) = self.single_block_lookups.get_mut(&id.lookup_id) else { debug!( ?id, - "Payload envelope returned for single block lookup not present" + "Payload envelope returned for a lookup id that doesn't exist" ); return; }; diff --git a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs index d8054e8079..ff17db4322 100644 --- a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs +++ b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs @@ -144,14 +144,14 @@ pub enum PeerType { /// The peer claims to have imported a FULL child of this block whose bid references /// `ExecutionBlockHash` as its parent. Such peers can serve this block's payload envelope and /// data columns. - GloasChild(ExecutionBlockHash), + PayloadEnvelope(ExecutionBlockHash), } impl PeerType { - /// `GloasChild` when the block's bid `parent_block_hash` is known (post-Gloas), else `Block`. + /// `PayloadEnvelope` when the block's bid `parent_block_hash` is known (post-Gloas), else `Block`. pub fn new(parent_block_hash: Option) -> Self { match parent_block_hash { - Some(execution_hash) => PeerType::GloasChild(execution_hash), + Some(execution_hash) => PeerType::PayloadEnvelope(execution_hash), None => PeerType::Block, } } @@ -211,7 +211,7 @@ impl SingleBlockLookup { let mut gloas_child_peers = HashMap::new(); match peer_type { PeerType::Block => {} - PeerType::GloasChild(execution_hash) => { + PeerType::PayloadEnvelope(execution_hash) => { gloas_child_peers.insert(*execution_hash, block_peers.clone()); } } @@ -638,7 +638,7 @@ impl SingleBlockLookup { pub fn add_peer(&mut self, peer_id: PeerId, peer_type: &PeerType) -> bool { let mut added = false; match peer_type { - PeerType::GloasChild(execution_hash) => { + PeerType::PayloadEnvelope(execution_hash) => { // This peer claims to have imported a FULL child of this block whose bid references // `execution_hash` as its parent. It is therefore proven to hold this block's // payload envelope and data columns.