Skip to content

[Merged by Bors] - remove optional_eth2_network_config #4611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - remove optional_eth2_network_config #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions lighthouse/environment/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,18 +344,6 @@ impl<E: EthSpec> EnvironmentBuilder<E> {
Ok(self)
}

/// Optionally adds a network configuration to the environment.
pub fn optional_eth2_network_config(
self,
optional_config: Option<Eth2NetworkConfig>,
) -> Result<Self, String> {
if let Some(config) = optional_config {
self.eth2_network_config(config)
} else {
Ok(self)
}
}

/// Consumes the builder, returning an `Environment`.
pub fn build(self) -> Result<Environment<E>, String> {
let (signal, exit) = exit_future::signal();
Expand Down
2 changes: 1 addition & 1 deletion lighthouse/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ fn run<E: EthSpec>(

let mut environment = builder
.multi_threaded_tokio_runtime()?
.optional_eth2_network_config(Some(eth2_network_config))?
.eth2_network_config(eth2_network_config)?
.build()?;

let log = environment.core_context().log().clone();
Expand Down