Fix more merge conflicts between unstable and release-v7.0.0

beacon_node/network/src/network_beacon_processor/sync_methods.rs

@@ -831,10 +831,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
             }
             // Penalise peers for sending us banned blocks.
             BlockError::KnownInvalidExecutionPayload(block_root) => {
-                warn!(
+                warn!(?block_root, "Received block known to be invalid",);
-                    ?block_root,
-                    "Received block known to be invalid",
-                );
                 Err(ChainSegmentFailed {
                     message: format!("Banned block: {block_root:?}"),
                     peer_action: Some(PeerAction::Fatal),

beacon_node/src/config.rs

@@ -918,11 +918,7 @@ pub fn get_config<E: EthSpec>(
                 |s| match Hash256::from_str(s.strip_prefix("0x").unwrap_or(s).trim()) {
                     Ok(block_root) => Some(block_root),
                     Err(error) => {
-                        warn!(
+                        warn!(block_root = s, ?error, "Unable to parse invalid block root",);
-                            block_root = s,
-                            ?error,
-                            "Unable to parse invalid block root",
-                        );
                         None
                     }
                 },

lighthouse/tests/beacon_node.rs

@@ -2811,6 +2811,9 @@ fn data_column_publishing_delay_for_testing() {
                 Some(Duration::from_secs_f64(3.5f64))
             );
         });
+}
+
+#[test]
 fn invalid_block_roots_flag() {
     let dir = TempDir::new().expect("Unable to create temporary directory");
     let mut file =