resolve merge issues

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -2784,7 +2784,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         block_root: Hash256,
         unverified_block: B,
         notify_execution_layer: NotifyExecutionLayer,
-                publish_fn: impl FnOnce() -> Result<(), BlockError<T::EthSpec>> + Send + 'static,
+        publish_fn: impl FnOnce() -> Result<(), BlockError<T::EthSpec>> + Send + 'static,
     ) -> Result<AvailabilityProcessingStatus, BlockError<T::EthSpec>> {
         // Start the Prometheus timer.
         let _full_timer = metrics::start_timer(&metrics::BLOCK_PROCESSING_TIMES);
@@ -2801,7 +2801,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         )?;
 
         //TODO(sean) error handling?
-            publish_fn()?;
+        publish_fn()?;
 
         let executed_block = self
             .clone()

beacon_node/beacon_chain/src/test_utils.rs

@@ -812,9 +812,9 @@ where
         &self,
         state: BeaconState<E>,
         slot: Slot,
-    ) -> (SignedBlindedBeaconBlock<E>, BeaconState<E>) {
+    ) -> (BlockContentsTuple<E, BlindedPayload<E>>, BeaconState<E>) {
         let (unblinded, new_state) = self.make_block(state, slot).await;
-        (unblinded.into(), new_state)
+        ((unblinded.0.into(), unblinded.1), new_state)
     }
 
     /// Returns a newly created block, signed by the proposer for the given slot.
@@ -1839,7 +1839,9 @@ where
         self.set_current_slot(slot);
         let block_hash: SignedBeaconBlockHash = self
             .chain
-            .process_block(block_root, block.into(), NotifyExecutionLayer::Yes,|| Ok(()),)
+            .process_block(block_root, block.into(), NotifyExecutionLayer::Yes, || {
+                Ok(())
+            })
             .await?
             .try_into()
             .unwrap();

beacon_node/beacon_chain/tests/tests.rs

@@ -686,7 +686,7 @@ async fn run_skip_slot_test(skip_slots: u64) {
             harness_a.chain.head_snapshot().beacon_block_root,
             harness_a.get_head_block(),
             NotifyExecutionLayer::Yes,
-                            || Ok(())
+            || Ok(()),
         )
         .await
         .unwrap();