From 42b34dbbe4515be73e7354a43a427d3c6ea66b78 Mon Sep 17 00:00:00 2001 From: realbigsean Date: Thu, 24 Aug 2023 14:35:06 -0400 Subject: [PATCH] cargo fmt --- .../beacon_chain/src/blob_verification.rs | 3 +- .../src/data_availability_checker.rs | 7 ++--- .../overflow_lru_cache.rs | 5 ++-- .../tests/attestation_production.rs | 26 ++++++++++------- .../network_beacon_processor/sync_methods.rs | 7 +++-- .../network/src/sync/block_lookups/common.rs | 14 +++++---- .../network/src/sync/block_lookups/mod.rs | 29 +++++++++---------- .../sync/block_lookups/single_block_lookup.rs | 4 +-- .../src/sync/block_sidecar_coupling.rs | 4 +-- consensus/types/src/blob_sidecar.rs | 5 +++- 10 files changed, 55 insertions(+), 49 deletions(-) diff --git a/beacon_node/beacon_chain/src/blob_verification.rs b/beacon_node/beacon_chain/src/blob_verification.rs index 4ece4b36de..ae66b093be 100644 --- a/beacon_node/beacon_chain/src/blob_verification.rs +++ b/beacon_node/beacon_chain/src/blob_verification.rs @@ -241,7 +241,8 @@ pub fn validate_blob_sidecar_for_gossip( let Some(parent_block) = chain .canonical_head .fork_choice_read_lock() - .get_block(&block_parent_root) else { + .get_block(&block_parent_root) + else { return Err(GossipBlobError::BlobParentUnknown( signed_blob_sidecar.message, )); diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/beacon_node/beacon_chain/src/data_availability_checker.rs index 8488b98ffe..080addb3a7 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker.rs @@ -349,11 +349,8 @@ pub fn consistency_checks( block: &SignedBeaconBlock, blobs: &[Arc>], ) -> Result<(), AvailabilityCheckError> { - let Ok(block_kzg_commitments) = block - .message() - .body() - .blob_kzg_commitments() else { - return Ok(()) + let Ok(block_kzg_commitments) = block.message().body().blob_kzg_commitments() else { + return Ok(()); }; if blobs.len() != block_kzg_commitments.len() { diff --git a/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs b/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs index e08f1994d1..f7bbb861c9 100644 --- a/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs +++ b/beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs @@ -586,8 +586,9 @@ impl OverflowLRUCache { let Some(verified_blobs) = Vec::from(pending_components.verified_blobs) .into_iter() .take(num_blobs_expected) - .collect::>>() else { - return Ok(Availability::MissingComponents(import_data.block_root)) + .collect::>>() + else { + return Ok(Availability::MissingComponents(import_data.block_root)); }; let available_block = make_available(block, verified_blobs)?; diff --git a/beacon_node/beacon_chain/tests/attestation_production.rs b/beacon_node/beacon_chain/tests/attestation_production.rs index 6fdbce4f20..642ff32959 100644 --- a/beacon_node/beacon_chain/tests/attestation_production.rs +++ b/beacon_node/beacon_chain/tests/attestation_production.rs @@ -136,13 +136,15 @@ async fn produces_attestations() { let rpc_block = RpcBlock::::new(Arc::new(block.clone()), Some(blobs.clone())) .unwrap(); - let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = chain + let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available( + available_block, + ) = chain .data_availability_checker .check_rpc_block_availability(rpc_block) .unwrap() - else { - panic!("block should be available") - }; + else { + panic!("block should be available") + }; let early_attestation = { let proto_block = chain @@ -212,13 +214,15 @@ async fn early_attester_cache_old_request() { let rpc_block = RpcBlock::::new(head.beacon_block.clone(), Some(head_blobs)).unwrap(); - let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = harness.chain - .data_availability_checker - .check_rpc_block_availability(rpc_block) - .unwrap() - else { - panic!("block should be available") - }; + let beacon_chain::data_availability_checker::MaybeAvailableBlock::Available(available_block) = + harness + .chain + .data_availability_checker + .check_rpc_block_availability(rpc_block) + .unwrap() + else { + panic!("block should be available") + }; harness .chain diff --git a/beacon_node/network/src/network_beacon_processor/sync_methods.rs b/beacon_node/network/src/network_beacon_processor/sync_methods.rs index 9489d5fabb..07332628a4 100644 --- a/beacon_node/network/src/network_beacon_processor/sync_methods.rs +++ b/beacon_node/network/src/network_beacon_processor/sync_methods.rs @@ -279,9 +279,10 @@ impl NetworkBeaconProcessor { _seen_timestamp: Duration, process_type: BlockProcessType, ) { - let Some(slot) = blobs.iter().find_map(|blob|{ - blob.as_ref().map(|blob| blob.slot) - }) else { + let Some(slot) = blobs + .iter() + .find_map(|blob| blob.as_ref().map(|blob| blob.slot)) + else { return; }; diff --git a/beacon_node/network/src/sync/block_lookups/common.rs b/beacon_node/network/src/sync/block_lookups/common.rs index 7e58006de5..05cf0a9b5c 100644 --- a/beacon_node/network/src/sync/block_lookups/common.rs +++ b/beacon_node/network/src/sync/block_lookups/common.rs @@ -149,12 +149,14 @@ pub trait RequestState { .copied() .map(PeerShouldHave::BlockAndBlobs); - let Some(peer_id) = available_peer_opt.or_else(||request_state - .potential_peers - .iter() - .choose(&mut rand::thread_rng()) - .copied() - .map(PeerShouldHave::Neither)) else { + let Some(peer_id) = available_peer_opt.or_else(|| { + request_state + .potential_peers + .iter() + .choose(&mut rand::thread_rng()) + .copied() + .map(PeerShouldHave::Neither) + }) else { return Err(LookupRequestError::NoPeers); }; request_state.used_peers.insert(peer_id.to_peer_id()); diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs index ee1a6a6779..2aa337e2f7 100644 --- a/beacon_node/network/src/sync/block_lookups/mod.rs +++ b/beacon_node/network/src/sync/block_lookups/mod.rs @@ -597,7 +597,7 @@ impl BlockLookups { if response.is_some() { debug!(self.log, "Response for a parent lookup request that was not found"; "peer_id" => %peer_id); } - return + return; }; match self.parent_lookup_response_inner::( @@ -781,7 +781,7 @@ impl BlockLookups { "peer_id" => %peer_id, "error" => msg ); - return + return; }; R::request_state_mut(&mut parent_lookup.current_parent_request) .register_failure_downloading(); @@ -845,14 +845,14 @@ impl BlockLookups { cx: &mut SyncNetworkContext, ) { let Some(mut lookup) = self.single_block_lookups.remove(&target_id) else { - return; - }; + return; + }; let root = lookup.block_root(); let request_state = R::request_state_mut(&mut lookup); - let Ok(peer_id) = request_state.get_state().processing_peer() else { - return + let Ok(peer_id) = request_state.get_state().processing_peer() else { + return; }; debug!( self.log, @@ -1044,7 +1044,7 @@ impl BlockLookups { .find(|(_, lookup)| lookup.chain_hash() == chain_hash) .map(|(index, _)| index); - let Some(mut parent_lookup) = index.map(|index|self.parent_lookups.remove(index)) else { + let Some(mut parent_lookup) = index.map(|index| self.parent_lookups.remove(index)) else { return debug!(self.log, "Process response for a parent lookup request that was not found"; "chain_hash" => %chain_hash); }; @@ -1187,7 +1187,7 @@ impl BlockLookups { .iter() .find_map(|(id, lookup)| (lookup.block_root() == chain_hash).then_some(*id)) { - let Some(child_lookup) = self.single_block_lookups.get_mut(&child_lookup_id) else { + let Some(child_lookup) = self.single_block_lookups.get_mut(&child_lookup_id) else { debug!(self.log, "Missing child for parent lookup request"; "child_root" => ?chain_hash); return blocks; }; @@ -1233,9 +1233,8 @@ impl BlockLookups { mut parent_lookup: ParentLookup, ) { // We should always have a block peer. - let Ok(block_peer_id) = - parent_lookup.block_processing_peer() else { - return + let Ok(block_peer_id) = parent_lookup.block_processing_peer() else { + return; }; let block_peer_id = block_peer_id.to_peer_id(); @@ -1301,15 +1300,13 @@ impl BlockLookups { let Some(id) = self .single_block_lookups .iter() - .find_map(|(id, req)| - (req.block_root() == chain_hash).then_some(*id)) else { + .find_map(|(id, req)| (req.block_root() == chain_hash).then_some(*id)) + else { warn!(self.log, "No id found for single block lookup"; "chain_hash" => %chain_hash); return; }; - let Some(lookup) = self - .single_block_lookups - .get_mut(&id) else { + let Some(lookup) = self.single_block_lookups.get_mut(&id) else { warn!(self.log, "No id found for single block lookup"; "chain_hash" => %chain_hash); 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 897c0cad0b..a6ec24ee20 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 @@ -135,8 +135,8 @@ impl SingleBlockLookup { /// 4. `Err`: The child is required, but has failed consistency checks. pub fn get_cached_child_block(&self) -> CachedChild { if let Some(components) = self.cached_child_components.as_ref() { - let Some(block) = components.downloaded_block.as_ref()else { - return CachedChild::DownloadIncomplete + let Some(block) = components.downloaded_block.as_ref() else { + return CachedChild::DownloadIncomplete; }; if !self.missing_blob_ids().is_empty() { diff --git a/beacon_node/network/src/sync/block_sidecar_coupling.rs b/beacon_node/network/src/sync/block_sidecar_coupling.rs index fce7a2e30d..32029777ee 100644 --- a/beacon_node/network/src/sync/block_sidecar_coupling.rs +++ b/beacon_node/network/src/sync/block_sidecar_coupling.rs @@ -57,8 +57,8 @@ impl BlocksAndBlobsRequestInfo { for blob in blob_list { let blob_index = blob.index as usize; let Some(blob_opt) = blobs_buffer.get_mut(blob_index) else { - return Err("Invalid blob index"); - }; + return Err("Invalid blob index"); + }; if blob_opt.is_some() { return Err("Repeat blob index"); } else { diff --git a/consensus/types/src/blob_sidecar.rs b/consensus/types/src/blob_sidecar.rs index f19068edfb..60b57b8580 100644 --- a/consensus/types/src/blob_sidecar.rs +++ b/consensus/types/src/blob_sidecar.rs @@ -129,7 +129,10 @@ impl BlobSidecar { // Ensure that the blob is canonical by ensuring that // each field element contained in the blob is < BLS_MODULUS for i in 0..T::Kzg::FIELD_ELEMENTS_PER_BLOB { - let Some(byte) = blob_bytes.get_mut(i.checked_mul(T::Kzg::BYTES_PER_FIELD_ELEMENT).ok_or("overflow".to_string())?) else { + let Some(byte) = blob_bytes.get_mut( + i.checked_mul(T::Kzg::BYTES_PER_FIELD_ELEMENT) + .ok_or("overflow".to_string())?, + ) else { return Err(format!("blob byte index out of bounds: {:?}", i)); }; *byte = 0;