revert

sigp · Feb 26, 2025 · b3395b0 · b3395b0
1 parent 9455fd0
commit b3395b0
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 262 deletions.
diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -4848,7 +4848,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         let proposer_index = if let Some(proposer) = cached_proposer {
             proposer.index as u64
         } else {
-            if 2 + 2 == 5 && head_epoch + 2 < proposal_epoch {
+            if head_epoch + 2 < proposal_epoch {
                 warn!(
                     self.log,
                     "Skipping proposer preparation";
@@ -6089,10 +6089,8 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     //
                     // This prevents the routine from running during sync.
                     let head_slot = cached_head.head_slot();
-                    if 2 + 2 == 5
-                        && head_slot
-                            + T::EthSpec::slots_per_epoch() * PREPARE_PROPOSER_HISTORIC_EPOCHS
-                            < current_slot
+                    if head_slot + T::EthSpec::slots_per_epoch() * PREPARE_PROPOSER_HISTORIC_EPOCHS
+                        < current_slot
                     {
                         debug!(
                             chain.log,

diff --git a/beacon_node/beacon_chain/src/chain_config.rs b/beacon_node/beacon_chain/src/chain_config.rs
@@ -94,8 +94,6 @@ pub struct ChainConfig {
     /// The delay in milliseconds applied by the node between sending each blob or data column batch.
     /// This doesn't apply if the node is the block proposer.
     pub blob_publication_batch_interval: Duration,
-    pub disable_attesting: bool,
-    pub sync_tolerance_epochs: u64,
     pub invalid_block_roots: HashSet<Hash256>,
 }
 
@@ -132,8 +130,6 @@ impl Default for ChainConfig {
             enable_sampling: false,
             blob_publication_batches: 4,
             blob_publication_batch_interval: Duration::from_millis(300),
-            disable_attesting: false,
-            sync_tolerance_epochs: 16,
             invalid_block_roots: HashSet::new(),
         }
     }

diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml
@@ -46,11 +46,11 @@ tree_hash = { workspace = true }
 types = { workspace = true }
 warp = { workspace = true }
 warp_utils = { workspace = true }
-proto_array = { workspace = true }
 
 [dev-dependencies]
 genesis = { workspace = true }
 logging = { workspace = true }
+proto_array = { workspace = true }
 serde_json = { workspace = true }
 
 [[test]]