Merge branch 'gloas-range-sync' of https://github.com/eserilev/lighthouse into gloas-range-sync

beacon_node/network/Cargo.toml

@@ -10,7 +10,6 @@ disable-backfill = []
 fork_from_env = ["beacon_chain/fork_from_env"]
 fake_crypto = ["bls/fake_crypto", "kzg/fake_crypto"]
 portable = ["beacon_chain/portable"]
-test_logger = []
 
 [dependencies]
 alloy-primitives = { workspace = true }

beacon_node/network/src/network_beacon_processor/tests.rs

@@ -2131,6 +2131,7 @@ fn make_test_payload_envelope(
             execution_requests: ExecutionRequests::default(),
             builder_index: 0,
             beacon_block_root,
+            parent_beacon_block_root: Hash256::ZERO,
         },
         signature: Signature::empty(),
     }

beacon_node/network/src/sync/block_sidecar_coupling.rs

@@ -1279,6 +1279,7 @@ mod tests {
             execution_requests: ExecutionRequests::default(),
             builder_index: 0,
             beacon_block_root: Hash256::from(rng.random::<[u8; 32]>()),
+            parent_beacon_block_root: Hash256::repeat_byte(0),
         };
         Arc::new(SignedExecutionPayloadEnvelope {
             message: envelope,

beacon_node/network/src/sync/tests/mod.rs

@@ -148,13 +148,13 @@ pub fn init_tracing() {
     INIT_TRACING.call_once(|| {
         if std::env::var(CI_LOGGER_DIR_ENV_VAR).is_ok() {
             // Enable logging to log files for each test and each fork.
-            tracing_subscriber::registry()
+            let _ = tracing_subscriber::registry()
                 .with(
                     tracing_subscriber::fmt::layer()
                         .with_ansi(false)
                         .with_writer(CILogWriter),
                 )
-                .init();
+                .try_init();
         }
     });
 }