Merge branch 'master' into beacon-state-caching

This commit is contained in:
Paul Hauner
2019-02-24 19:14:05 +13:00
44 changed files with 920 additions and 835 deletions

View File

@@ -6,4 +6,4 @@ pub use self::beacon_chain::{
BeaconChain, BlockProcessingOutcome, Error, InvalidBlock, ValidBlock,
};
pub use self::checkpoint::CheckPoint;
pub use fork_choice::{ForkChoice, ForkChoiceAlgorithms, ForkChoiceError};
pub use fork_choice::{ForkChoice, ForkChoiceAlgorithm, ForkChoiceError};