Merge branch 'fork-choice-restore' into eth1-deploy

This commit is contained in:
Paul Hauner
2019-11-29 17:03:07 +11:00
13 changed files with 359 additions and 21 deletions

View File

@@ -493,7 +493,7 @@ where
.clone()
.ok_or_else(|| "beacon_chain requires a slot clock")?,
)
.empty_reduced_tree_fork_choice()
.reduced_tree_fork_choice()
.map_err(|e| format!("Failed to init fork choice: {}", e))?
.build()
.map_err(|e| format!("Failed to build beacon chain: {}", e))?;