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

renamings

Browse Source
This commit is contained in:
realbigsean
2023-04-26 14:45:07 -04:00
parent 4390036887
commit 69e5e00350
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/beacon_processor/worker/sync_methods.rs
View File

@@ -60,7 +60,7 @@ impl<T: BeaconChainTypes> Worker<T> {
// Sync handles these results
self.send_sync_message(SyncMessage::BlockPartProcessed {
process_type,
result: crate::sync::manager::BlockPartProcessingResult::Ignored,
result: crate::sync::manager::BlockProcessingResult::Ignored,
response_type: crate::sync::manager::ResponseType::Block,
});
return;

32
beacon_node/network/src/sync/block_lookups/mod.rs
View File

@@ -17,7 +17,7 @@ use types::{BlobSidecar, SignedBeaconBlock, Slot};
use self::parent_lookup::{LookupDownloadStatus, PARENT_FAIL_TOLERANCE};
use self::parent_lookup::{ParentLookup, ParentVerifyError};
use self::single_block_lookup::SingleBlockLookup;
use super::manager::BlockPartProcessingResult;
use super::manager::BlockProcessingResult;
use super::BatchProcessResult;
use super::{
manager::{BlockProcessType, Id},
@@ -794,7 +794,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
pub fn single_block_processed(
&mut self,
id: Id,
result: BlockPartProcessingResult<T::EthSpec>,
result: BlockProcessingResult<T::EthSpec>,
response_type: ResponseType,
cx: &mut SyncNetworkContext<T>,
) {
@@ -825,7 +825,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
};
let should_remove_lookup = match result {
BlockPartProcessingResult::Ok(status) => match status {
BlockProcessingResult::Ok(status) => match status {
AvailabilityProcessingStatus::Imported(root) => {
trace!(self.log, "Single block processing succeeded"; "block" => %root);
ShouldRemoveLookup::True
@@ -836,7 +836,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
ShouldRemoveLookup::False
}
},
BlockPartProcessingResult::Ignored => {
BlockProcessingResult::Ignored => {
// Beacon processor signalled to ignore the block processing result.
// This implies that the cpu is overloaded. Drop the request.
warn!(
@@ -846,7 +846,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
);
ShouldRemoveLookup::True
}
BlockPartProcessingResult::Err(e) => {
BlockProcessingResult::Err(e) => {
trace!(self.log, "Single block processing failed"; "block" => %root, "error" => %e);
match e {
BlockError::BlockIsAlreadyKnown => {
@@ -907,7 +907,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
pub fn parent_block_processed(
&mut self,
chain_hash: Hash256,
result: BlockPartProcessingResult<T::EthSpec>,
result: BlockProcessingResult<T::EthSpec>,
response_type: ResponseType,
cx: &mut SyncNetworkContext<T>,
) {
@@ -932,7 +932,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
};
match &result {
BlockPartProcessingResult::Ok(status) => match status {
BlockProcessingResult::Ok(status) => match status {
AvailabilityProcessingStatus::Imported(block_root) => {
trace!(self.log, "Parent block processing succeeded"; &parent_lookup, "block_root" => ?block_root)
}
@@ -940,10 +940,10 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
trace!(self.log, "Parent missing parts, triggering single block lookup "; &parent_lookup,"block_root" => ?block_root)
}
},
BlockPartProcessingResult::Err(e) => {
BlockProcessingResult::Err(e) => {
trace!(self.log, "Parent block processing failed"; &parent_lookup, "error" => %e)
}
BlockPartProcessingResult::Ignored => {
BlockProcessingResult::Ignored => {
trace!(
self.log,
"Parent block processing job was ignored";
@@ -954,18 +954,18 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
}
match result {
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::MissingComponents(
BlockProcessingResult::Ok(AvailabilityProcessingStatus::MissingComponents(
_,
block_root,
)) => {
self.search_block(block_root, peer_id, PeerShouldHave::BlockAndBlobs, cx);
}
BlockPartProcessingResult::Err(BlockError::ParentUnknown(block)) => {
BlockProcessingResult::Err(BlockError::ParentUnknown(block)) => {
parent_lookup.add_block_wrapper(block);
self.request_parent_block_and_blobs(parent_lookup, cx);
}
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::Imported(_))
| BlockPartProcessingResult::Err(BlockError::BlockIsAlreadyKnown { .. }) => {
BlockProcessingResult::Ok(AvailabilityProcessingStatus::Imported(_))
| BlockProcessingResult::Err(BlockError::BlockIsAlreadyKnown { .. }) => {
// Check if the beacon processor is available
let beacon_processor_send = match cx.processor_channel_if_enabled() {
Some(channel) => channel,
@@ -997,7 +997,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
}
}
}
ref e @ BlockPartProcessingResult::Err(BlockError::ExecutionPayloadError(ref epe))
ref e @ BlockProcessingResult::Err(BlockError::ExecutionPayloadError(ref epe))
if !epe.penalize_peer() =>
{
// These errors indicate that the execution layer is offline
@@ -1009,7 +1009,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
"error" => ?e
);
}
BlockPartProcessingResult::Err(outcome) => {
BlockProcessingResult::Err(outcome) => {
// all else we consider the chain a failure and downvote the peer that sent
// us the last block
warn!(
@@ -1035,7 +1035,7 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
}
}
}
BlockPartProcessingResult::Ignored => {
BlockProcessingResult::Ignored => {
// Beacon processor signalled to ignore the block processing result.
// This implies that the cpu is overloaded. Drop the request.
warn!(

12
beacon_node/network/src/sync/block_lookups/tests.rs
View File

@@ -188,7 +188,7 @@ fn test_single_block_lookup_happy_path() {
bl.single_block_lookup_response(id, peer_id, None, D, &mut cx);
bl.single_block_processed(
id,
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
BlockProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
ResponseType::Block,
&mut cx,
);
@@ -361,7 +361,7 @@ fn test_parent_lookup_wrong_response() {
// Processing succeeds, now the rest of the chain should be sent for processing.
bl.parent_block_processed(
chain_hash,
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
BlockProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
ResponseType::Block,
&mut cx,
);
@@ -401,7 +401,7 @@ fn test_parent_lookup_empty_response() {
// Processing succeeds, now the rest of the chain should be sent for processing.
bl.parent_block_processed(
chain_hash,
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
BlockProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
ResponseType::Block,
&mut cx,
);
@@ -448,7 +448,7 @@ fn test_parent_lookup_rpc_failure() {
// Processing succeeds, now the rest of the chain should be sent for processing.
bl.parent_block_processed(
chain_hash,
BlockPartProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
BlockProcessingResult::Ok(AvailabilityProcessingStatus::Imported(block_root)),
ResponseType::Block,
&mut cx,
);
@@ -700,7 +700,7 @@ fn test_single_block_lookup_ignored_response() {
// Send an Ignored response, the request should be dropped
bl.single_block_processed(
id,
BlockPartProcessingResult::Ignored,
BlockProcessingResult::Ignored,
ResponseType::Block,
&mut cx,
);
@@ -732,7 +732,7 @@ fn test_parent_lookup_ignored_response() {
// Return an Ignored result. The request should be dropped
bl.parent_block_processed(
chain_hash,
BlockPartProcessingResult::Ignored,
BlockProcessingResult::Ignored,
ResponseType::Block,
&mut cx,
);

14
beacon_node/network/src/sync/manager.rs
View File

@@ -154,7 +154,7 @@ pub enum SyncMessage<T: EthSpec> {
/// Block processed
BlockPartProcessed {
process_type: BlockProcessType,
result: BlockPartProcessingResult<T>,
result: BlockProcessingResult<T>,
response_type: ResponseType,
},
}
@@ -167,7 +167,7 @@ pub enum BlockProcessType {
}
#[derive(Debug)]
pub enum BlockPartProcessingResult<T: EthSpec> {
pub enum BlockProcessingResult<T: EthSpec> {
Ok(AvailabilityProcessingStatus),
Err(BlockError<T>),
Ignored,
@@ -1097,18 +1097,18 @@ impl<T: BeaconChainTypes> SyncManager<T> {
}
impl<T: EthSpec> From<Result<AvailabilityProcessingStatus, BlockError<T>>>
for BlockPartProcessingResult<T>
for BlockProcessingResult<T>
{
fn from(result: Result<AvailabilityProcessingStatus, BlockError<T>>) -> Self {
match result {
Ok(status) => BlockPartProcessingResult::Ok(status),
Err(e) => BlockPartProcessingResult::Err(e),
Ok(status) => BlockProcessingResult::Ok(status),
Err(e) => BlockProcessingResult::Err(e),
}
}
}
impl<T: EthSpec> From<BlockError<T>> for BlockPartProcessingResult<T> {
impl<T: EthSpec> From<BlockError<T>> for BlockProcessingResult<T> {
fn from(e: BlockError<T>) -> Self {
BlockPartProcessingResult::Err(e)
BlockProcessingResult::Err(e)
}
}