Merge branch 'rpc-block-avail-varaint' of https://github.com/eserilev/lighthouse into rpc-block-avail-varaint

Author: eserilev

beacon_node/beacon_chain/src/block_verification_types.rs

@@ -21,10 +21,6 @@ use types::{
 ///    verification. i.e. this block has all the required data to get verified and imported into fork choice.
 ///
 /// 2. `BlockOnly`: This is a post-deneb block that may or may not require blobs to be considered fully available.
-///
-/// Note: We make a distinction over blocks received over gossip because
-/// in a post-deneb world, the blobs corresponding to a given block that are received
-/// over rpc do not contain the proposer signature for dos resistance.
 #[derive(Clone, Educe)]
 #[educe(Hash(bound(E: EthSpec)))]
 pub enum RpcBlock<E: EthSpec> {

beacon_node/beacon_chain/src/data_availability_checker/error.rs

@@ -22,7 +22,6 @@ pub enum Error {
     BlockReplayError(state_processing::BlockReplayError),
     RebuildingStateCaches(BeaconStateError),
     SlotClockError,
-    InvalidFork,
     InvalidAvailableBlockData,
 }
 
@@ -47,7 +46,6 @@ impl Error {
             | Error::BlockReplayError(_)
             | Error::RebuildingStateCaches(_)
             | Error::SlotClockError
-            | Error::InvalidFork
             | Error::InvalidAvailableBlockData => ErrorCategory::Internal,
             Error::InvalidBlobs { .. }
             | Error::InvalidColumn { .. }