diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 7a8a747d8c..618a062b4f 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -3820,9 +3820,7 @@ impl BeaconChain { let block = execution_pending.block.block_cloned(); if block.fork_name_unchecked().gloas_enabled() { let bid = signed_payload_bid_from_block(block.as_ref())?; - chain - .pending_payload_cache - .init_pending_bid(block_root, bid); + chain.pending_payload_cache.insert_bid(block_root, bid); } publish_fn()?; diff --git a/beacon_node/beacon_chain/src/data_column_verification.rs b/beacon_node/beacon_chain/src/data_column_verification.rs index 9a48477ce8..d205604a71 100644 --- a/beacon_node/beacon_chain/src/data_column_verification.rs +++ b/beacon_node/beacon_chain/src/data_column_verification.rs @@ -1334,7 +1334,7 @@ pub(crate) fn load_gloas_payload_bid( chain .pending_payload_cache - .init_pending_bid(block_root, bid.clone()); + .insert_bid(block_root, bid.clone()); Ok(Some(bid)) } diff --git a/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs b/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs index 3341eb7591..71b5872d59 100644 --- a/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs +++ b/beacon_node/beacon_chain/src/pending_payload_cache/mod.rs @@ -54,7 +54,8 @@ use std::sync::Arc; use task_executor::TaskExecutor; use tracing::{Span, debug, error, instrument, trace}; use types::{ - ChainSpec, ColumnIndex, DataColumnSidecar, DataColumnSidecarList, Epoch, EthSpec, Hash256, PartialDataColumnSidecarRef + ChainSpec, ColumnIndex, DataColumnSidecar, DataColumnSidecarList, Epoch, EthSpec, Hash256, + PartialDataColumnSidecarRef, }; mod pending_column; @@ -230,11 +231,7 @@ impl PendingPayloadCache { } /// Inserts a bid into the pending payload cache. - pub fn insert_bid( - &self, - block_root: Hash256, - bid: Arc>, - ) { + pub fn insert_bid(&self, block_root: Hash256, bid: Arc>) { let mut write_lock = self.availability_cache.write(); write_lock.get_or_insert_mut(block_root, || PendingComponents::new(block_root, bid)); } @@ -756,7 +753,7 @@ mod data_availability_checker_tests { generate_rand_block_and_data_columns::(ForkName::Gloas, num_blobs, &mut rng, spec); let block_root = block.canonical_root(); let bid = signed_payload_bid_from_block(&block).expect("should get payload bid"); - cache.init_pending_bid(block_root, bid.clone()); + cache.insert_bid(block_root, bid.clone()); (bid, block_root, data_columns) } diff --git a/beacon_node/beacon_chain/tests/events.rs b/beacon_node/beacon_chain/tests/events.rs index b45083bfad..a2ca6ce2dd 100644 --- a/beacon_node/beacon_chain/tests/events.rs +++ b/beacon_node/beacon_chain/tests/events.rs @@ -92,7 +92,7 @@ async fn data_column_sidecar_event_on_process_gossip_data_column() { harness .chain .pending_payload_cache - .init_pending_bid(random_sidecar.beacon_block_root, Arc::new(bid)); + .insert_bid(random_sidecar.beacon_block_root, Arc::new(bid)); DataColumnSidecar::Gloas(random_sidecar) } else {