diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs index 4198425a7e..4e1d54dc13 100644 --- a/beacon_node/beacon_chain/src/beacon_chain.rs +++ b/beacon_node/beacon_chain/src/beacon_chain.rs @@ -336,8 +336,6 @@ pub struct BeaconChain { pub early_attester_cache: EarlyAttesterCache, /// A cache used to keep track of various block timings. pub block_times_cache: Arc>, - /// A list of any hard-coded forks that have been disabled. - pub disabled_forks: Vec, /// Sender given to tasks, so that if they encounter a state in which execution cannot /// continue they can request that everything shuts down. pub shutdown_sender: Sender, diff --git a/beacon_node/beacon_chain/src/builder.rs b/beacon_node/beacon_chain/src/builder.rs index 4662d05d3d..24a9a916bb 100644 --- a/beacon_node/beacon_chain/src/builder.rs +++ b/beacon_node/beacon_chain/src/builder.rs @@ -84,7 +84,6 @@ pub struct BeaconChainBuilder { validator_pubkey_cache: Option>, spec: ChainSpec, chain_config: ChainConfig, - disabled_forks: Vec, log: Option, graffiti: Graffiti, slasher: Option>>, @@ -122,7 +121,6 @@ where slot_clock: None, shutdown_sender: None, head_tracker: None, - disabled_forks: Vec::new(), validator_pubkey_cache: None, spec: TEthSpec::default_spec(), chain_config: ChainConfig::default(), @@ -184,13 +182,6 @@ where self.log = Some(log); self } - - /// Sets a list of hard-coded forks that will not be activated. - pub fn disabled_forks(mut self, disabled_forks: Vec) -> Self { - self.disabled_forks = disabled_forks; - self - } - /// Attempt to load an existing eth1 cache from the builder's `Store`. pub fn get_persisted_eth1_backend(&self) -> Result, String> { let store = self @@ -764,7 +755,6 @@ where validator_pubkey_cache: TimeoutRwLock::new(validator_pubkey_cache), attester_cache: <_>::default(), early_attester_cache: <_>::default(), - disabled_forks: self.disabled_forks, shutdown_sender: self .shutdown_sender .ok_or("Cannot build without a shutdown sender.")?, diff --git a/beacon_node/client/src/builder.rs b/beacon_node/client/src/builder.rs index d497af6485..550d89125e 100644 --- a/beacon_node/client/src/builder.rs +++ b/beacon_node/client/src/builder.rs @@ -135,7 +135,6 @@ where let chain_spec = self.chain_spec.clone(); let runtime_context = self.runtime_context.clone(); let eth_spec_instance = self.eth_spec_instance.clone(); - let disabled_forks = config.disabled_forks.clone(); let chain_config = config.chain.clone(); let graffiti = config.graffiti; @@ -169,7 +168,6 @@ where .store(store) .custom_spec(spec.clone()) .chain_config(chain_config) - .disabled_forks(disabled_forks) .graffiti(graffiti) .event_handler(event_handler) .execution_layer(execution_layer) diff --git a/beacon_node/client/src/config.rs b/beacon_node/client/src/config.rs index f4519e05c8..9768962260 100644 --- a/beacon_node/client/src/config.rs +++ b/beacon_node/client/src/config.rs @@ -58,8 +58,6 @@ pub struct Config { /// This is the method used for the 2019 client interop in Canada. pub dummy_eth1_backend: bool, pub sync_eth1_chain: bool, - /// A list of hard-coded forks that will be disabled. - pub disabled_forks: Vec, /// Graffiti to be inserted everytime we create a block. pub graffiti: Graffiti, /// When true, automatically monitor validators using the HTTP API. @@ -98,7 +96,6 @@ impl Default for Config { eth1: <_>::default(), execution_endpoints: None, suggested_fee_recipient: None, - disabled_forks: Vec::new(), graffiti: Graffiti::default(), http_api: <_>::default(), http_metrics: <_>::default(),