gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 12:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-02-10 21:38:19 -08:00
parent 23a7dc561f
commit 3778e50710
11 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/src/data_availability_router.rs
View File

@@ -388,14 +388,14 @@ impl<T: BeaconChainTypes> DataAvailabilityRouter<T> {
/// Direct access to v1 checker for block execution/availability checks.
///
/// Use this for operations that are specific to the legacy DA checker,
pub fn v1(&self) -> Arc<DataAvailabilityChecker<T>> {
self.v1.clone()
pub fn v1(&self) -> &Arc<DataAvailabilityChecker<T>> {
&self.v1
}
/// Direct access to v2 checker for payload availability checks.
///
/// Use this for operations that are specific to the Gloas DA checker,
pub fn v2(&self) -> Arc<DataAvailabilityCheckerV2<T>> {
self.v2.clone()
pub fn v2(&self) -> &Arc<DataAvailabilityCheckerV2<T>> {
&self.v2
}
}

18
beacon_node/beacon_chain/src/test_utils.rs
View File

@@ -2490,7 +2490,7 @@ where
return RpcBlock::new(
block,
Some(AvailableBlockData::NoData),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)
.unwrap();
@@ -2509,7 +2509,7 @@ where
RpcBlock::new(
block,
Some(block_data),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)
.unwrap()
@@ -2524,7 +2524,7 @@ where
RpcBlock::new(
block,
Some(block_data),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)
.unwrap()
@@ -2555,14 +2555,14 @@ where
RpcBlock::new(
block,
Some(block_data),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
} else {
RpcBlock::new(
block,
None,
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
}
@@ -2570,14 +2570,14 @@ where
RpcBlock::new(
block,
Some(AvailableBlockData::NoData),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
} else {
RpcBlock::new(
block,
None,
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
}
@@ -2598,14 +2598,14 @@ where
RpcBlock::new(
block,
Some(block_data),
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
} else {
RpcBlock::new(
block,
None,
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)?
}

32
beacon_node/beacon_chain/tests/block_verification.rs
View File

@@ -165,7 +165,7 @@ where
RpcBlock::new(
block,
Some(block_data),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap()
@@ -180,7 +180,7 @@ where
RpcBlock::new(
block,
Some(block_data),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap()
@@ -188,7 +188,7 @@ where
None => RpcBlock::new(
block,
Some(AvailableBlockData::NoData),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap(),
@@ -417,7 +417,7 @@ async fn chain_segment_non_linear_parent_roots() {
blocks[3] = RpcBlock::new(
Arc::new(SignedBeaconBlock::from_block(block, signature)),
blocks[3].block_data().cloned(),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -457,7 +457,7 @@ async fn chain_segment_non_linear_slots() {
blocks[3] = RpcBlock::new(
Arc::new(SignedBeaconBlock::from_block(block, signature)),
blocks[3].block_data().cloned(),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -487,7 +487,7 @@ async fn chain_segment_non_linear_slots() {
blocks[3] = RpcBlock::new(
Arc::new(SignedBeaconBlock::from_block(block, signature)),
blocks[3].block_data().cloned(),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.chain.spec.clone(),
)
.unwrap();
@@ -634,7 +634,7 @@ async fn invalid_signature_gossip_block() {
let rpc_block = RpcBlock::new(
Arc::new(signed_block),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -1645,7 +1645,7 @@ async fn add_base_block_to_altair_chain() {
let base_rpc_block = RpcBlock::new(
Arc::new(base_block.clone()),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -1676,7 +1676,7 @@ async fn add_base_block_to_altair_chain() {
RpcBlock::new(
Arc::new(base_block),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone()
)
.unwrap()
@@ -1796,7 +1796,7 @@ async fn add_altair_block_to_base_chain() {
let altair_rpc_block = RpcBlock::new(
Arc::new(altair_block.clone()),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -1827,7 +1827,7 @@ async fn add_altair_block_to_base_chain() {
RpcBlock::new(
Arc::new(altair_block),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone()
)
.unwrap()
@@ -1897,7 +1897,7 @@ async fn import_duplicate_block_unrealized_justification() {
let rpc_block = RpcBlock::new(
block.clone(),
Some(AvailableBlockData::NoData),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -2000,7 +2000,7 @@ async fn signature_verify_mixed_rpc_block_variants() {
RpcBlock::new(
block,
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.chain.spec.clone(),
)
.unwrap()
@@ -2070,7 +2070,7 @@ async fn rpc_block_construction_fails_with_wrong_blob_count() {
let result = RpcBlock::new(
Arc::new(block),
Some(block_data),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.chain.spec.clone(),
);
@@ -2145,7 +2145,7 @@ async fn rpc_block_rejects_missing_custody_columns() {
let result = RpcBlock::new(
Arc::new(block),
Some(block_data),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.chain.spec.clone(),
);
@@ -2233,7 +2233,7 @@ async fn rpc_block_allows_construction_past_da_boundary() {
let result = RpcBlock::new(
Arc::new(block),
Some(AvailableBlockData::NoData),
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.chain.spec.clone(),
);

8
beacon_node/beacon_chain/tests/payload_invalidation.rs
View File

@@ -688,7 +688,7 @@ async fn invalidates_all_descendants() {
let fork_rpc_block = RpcBlock::new(
fork_block.clone(),
None,
&rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.spec.clone(),
)
.unwrap();
@@ -796,7 +796,7 @@ async fn switches_heads() {
let fork_rpc_block = RpcBlock::new(
fork_block.clone(),
None,
&rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.spec.clone(),
)
.unwrap();
@@ -1074,7 +1074,7 @@ async fn invalid_parent() {
let rpc_block = RpcBlock::new(
block.clone(),
None,
&rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.spec.clone(),
)
.unwrap();
@@ -1405,7 +1405,7 @@ async fn recover_from_invalid_head_by_importing_blocks() {
let fork_rpc_block = RpcBlock::new(
fork_block.clone(),
None,
&rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.data_availability_checker.v1(),
rig.harness.chain.spec.clone(),
)
.unwrap();

6
beacon_node/beacon_chain/tests/store_tests.rs
View File

@@ -3201,7 +3201,7 @@ async fn weak_subjectivity_sync_test(
AvailableBlock::new(
Arc::new(corrupt_block),
data,
&beacon_chain.data_availability_checker.v1(),
beacon_chain.data_availability_checker.v1(),
Arc::new(spec),
)
.expect("available block")
@@ -3751,7 +3751,7 @@ async fn process_blocks_and_attestations_for_unaligned_checkpoint() {
let invalid_fork_rpc_block = RpcBlock::new(
invalid_fork_block.clone(),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();
@@ -3773,7 +3773,7 @@ async fn process_blocks_and_attestations_for_unaligned_checkpoint() {
let valid_fork_rpc_block = RpcBlock::new(
valid_fork_block.clone(),
None,
&harness.chain.data_availability_checker.v1(),
harness.chain.data_availability_checker.v1(),
harness.spec.clone(),
)
.unwrap();

2
beacon_node/http_api/src/publish_blocks.rs
View File

@@ -316,7 +316,7 @@ pub async fn publish_block<T: BeaconChainTypes, B: IntoGossipVerifiedBlock<T>>(
let Ok(rpc_block) = RpcBlock::new(
block.clone(),
None,
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
) else {
return Err(warp_utils::reject::custom_bad_request(

4
beacon_node/network/src/network_beacon_processor/tests.rs
View File

@@ -404,7 +404,7 @@ impl TestRig {
RpcBlock::new(
self.next_block.clone(),
None,
&self._harness.chain.data_availability_checker.v1(),
self._harness.chain.data_availability_checker.v1(),
self._harness.spec.clone(),
)
.unwrap(),
@@ -422,7 +422,7 @@ impl TestRig {
RpcBlock::new(
self.next_block.clone(),
None,
&self._harness.chain.data_availability_checker.v1(),
self._harness.chain.data_availability_checker.v1(),
self._harness.spec.clone(),
)
.unwrap(),

2
beacon_node/network/src/sync/network_context.rs
View File

@@ -1612,7 +1612,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
let block = RpcBlock::new(
block,
None,
&self.chain.data_availability_checker.v1(),
self.chain.data_availability_checker.v1(),
self.chain.spec.clone(),
)
.map_err(|_| SendErrorProcessor::SendError)?;

2
beacon_node/network/src/sync/tests/lookups.rs
View File

@@ -2290,7 +2290,7 @@ mod deneb_only {
let block = RpcBlock::new(
block,
None,
&self.rig.harness.chain.data_availability_checker.v1(),
self.rig.harness.chain.data_availability_checker.v1(),
self.rig.harness.chain.spec.clone(),
)
.unwrap();

6
beacon_node/network/src/sync/tests/range.rs
View File

@@ -454,7 +454,7 @@ fn build_rpc_block(
RpcBlock::new(
block,
Some(block_data),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap()
@@ -469,7 +469,7 @@ fn build_rpc_block(
RpcBlock::new(
block,
Some(block_data),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap()
@@ -478,7 +478,7 @@ fn build_rpc_block(
None => RpcBlock::new(
block,
Some(AvailableBlockData::NoData),
&chain.data_availability_checker.v1(),
chain.data_availability_checker.v1(),
chain.spec.clone(),
)
.unwrap(),

4
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -567,7 +567,7 @@ impl<E: EthSpec> Tester<E> {
RpcBlock::new(
block.clone(),
None,
&self.harness.chain.data_availability_checker.v1(),
self.harness.chain.data_availability_checker.v1(),
self.harness.chain.spec.clone(),
)
.map_err(|e| Error::InternalError(format!("{:?}", e)))?,
@@ -665,7 +665,7 @@ impl<E: EthSpec> Tester<E> {
RpcBlock::new(
block.clone(),
None,
&self.harness.chain.data_availability_checker.v1(),
self.harness.chain.data_availability_checker.v1(),
self.harness.chain.spec.clone(),
)
.map_err(|e| Error::InternalError(format!("{:?}", e)))?,