Merge remote-tracking branch 'origin/unstable' into tree-states

consensus/fork_choice/src/fork_choice.rs

@@ -278,7 +278,7 @@ pub enum AttestationFromBlock {
 }
 
 /// Parameters which are cached between calls to `ForkChoice::get_head`.
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ForkchoiceUpdateParameters {
     /// The most recent result of running `ForkChoice::get_head`.
     pub head_root: Hash256,

consensus/fork_choice/src/lib.rs

@@ -7,4 +7,6 @@ pub use crate::fork_choice::{
     QueuedAttestation, ResetPayloadStatuses,
 };
 pub use fork_choice_store::ForkChoiceStore;
-pub use proto_array::{Block as ProtoBlock, ExecutionStatus, InvalidationOperation};
+pub use proto_array::{
+    Block as ProtoBlock, ExecutionStatus, InvalidationOperation, ProposerHeadError,
+};