gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-06 10:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
dapplion
2025-06-12 15:45:36 +02:00
parent 8c8a8124ee
commit 56fcf289ec
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/lighthouse_network/src/types/globals.rs
View File

@@ -248,6 +248,10 @@ impl<E: EthSpec> NetworkGlobals<E> {
}
}
pub fn sampling_columns_count(&self) -> usize {
self.sampling_columns.read().len()
}
pub fn sampling_columns(&self) -> HashSet<ColumnIndex> {
self.sampling_columns.read().clone()
}

22
beacon_node/network/src/sync/network_context/block_components_by_range.rs
View File

@@ -188,10 +188,7 @@ impl<T: BeaconChainTypes> BlockComponentsByRangeRequest<T> {
} => {
if let Some((blocks, block_peer)) = blocks_by_range_request.to_finished() {
let peer_group = BatchPeers::new_from_block_peer(*block_peer);
let rpc_blocks = couple_blocks_base(
blocks.to_vec(),
cx.network_globals().sampling_columns.len(),
);
let rpc_blocks = couple_blocks_base(blocks.to_vec());
Ok(Some((rpc_blocks, peer_group)))
} else {
// Wait for blocks_by_range requests to complete
@@ -230,8 +227,7 @@ impl<T: BeaconChainTypes> BlockComponentsByRangeRequest<T> {
if blocks_with_data.is_empty() {
let custody_column_indices = cx
.network_globals()
.sampling_columns
.clone()
.sampling_columns()
.iter()
.copied()
.collect();
@@ -248,8 +244,7 @@ impl<T: BeaconChainTypes> BlockComponentsByRangeRequest<T> {
} else {
let mut column_indices = cx
.network_globals()
.sampling_columns
.clone()
.sampling_columns()
.iter()
.copied()
.collect::<Vec<_>>();
@@ -295,8 +290,7 @@ impl<T: BeaconChainTypes> BlockComponentsByRangeRequest<T> {
if let Some((columns, column_peers)) = custody_by_range_request.to_finished() {
let custody_column_indices = cx
.network_globals()
.sampling_columns
.clone()
.sampling_columns()
.iter()
.copied()
.collect();
@@ -425,13 +419,10 @@ impl<T: BeaconChainTypes> BlockComponentsByRangeRequest<T> {
}
}
fn couple_blocks_base<E: EthSpec>(
blocks: Vec<Arc<SignedBeaconBlock<E>>>,
custody_columns_count: usize,
) -> Vec<RpcBlock<E>> {
fn couple_blocks_base<E: EthSpec>(blocks: Vec<Arc<SignedBeaconBlock<E>>>) -> Vec<RpcBlock<E>> {
blocks
.into_iter()
.map(|block| RpcBlock::new_without_blobs(None, block, custody_columns_count))
.map(|block| RpcBlock::new_without_blobs(None, block))
.collect()
}
@@ -509,7 +500,6 @@ fn couple_blocks_fulu<E: EthSpec>(
Some(block_root),
block,
data_columns_with_block_root,
custody_column_indices.clone(),
spec,
)
.map_err(Error::InternalError)

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

@@ -209,7 +209,7 @@ fn complete() -> CompleteConfig {
impl TestRig {
fn our_custody_indices(&self) -> Vec<ColumnIndex> {
self.network_globals
.sampling_columns
.sampling_columns()
.iter()
.copied()
.collect()