Merge of #6631

Author: mergify[bot]

beacon_node/beacon_chain/src/execution_payload.rs

@@ -7,7 +7,6 @@
 //! So, this module contains functions that one might expect to find in other crates, but they live
 //! here for good reason.
 
-use crate::otb_verification_service::OptimisticTransitionBlock;
 use crate::{
     BeaconChain, BeaconChainError, BeaconChainTypes, BlockError, BlockProductionError,
     ExecutionPayloadError,
@@ -284,9 +283,6 @@ pub async fn validate_merge_block<'a, T: BeaconChainTypes>(
                     "block_hash" => ?execution_payload.parent_hash(),
                     "msg" => "the terminal block/parent was unavailable"
                 );
-                // Store Optimistic Transition Block in Database for later Verification
-                OptimisticTransitionBlock::from_block(block)
-                    .persist_in_store::<T, _>(&chain.store)?;
                 Ok(())
             } else {
                 Err(ExecutionPayloadError::UnverifiedNonOptimisticCandidate.into())

beacon_node/beacon_chain/src/lib.rs

@@ -47,7 +47,6 @@ pub mod observed_block_producers;
 pub mod observed_data_sidecars;
 pub mod observed_operations;
 mod observed_slashable;
-pub mod otb_verification_service;
 mod persisted_beacon_chain;
 mod persisted_fork_choice;
 mod pre_finalization_cache;