Update Rust Edition to 2024 (#7766)

* #7749

Thanks @dknopik and @michaelsproul for your help!

testing/simulator/src/basic_sim.rs

@@ -1,13 +1,14 @@
 use crate::local_network::LocalNetworkParams;
 use crate::local_network::TERMINAL_BLOCK;
-use crate::{checks, LocalNetwork};
+use crate::{LocalNetwork, checks};
 use clap::ArgMatches;
 
 use crate::retry::with_retry;
 use futures::prelude::*;
 use node_test_rig::{
+    ApiTopic, ValidatorFiles,
     environment::{EnvironmentBuilder, LoggerConfig},
-    testing_validator_config, ApiTopic, ValidatorFiles,
+    testing_validator_config,
 };
 use rayon::prelude::*;
 use std::cmp::max;
@@ -17,7 +18,7 @@ use std::time::Duration;
 
 use environment::tracing_common;
 use tracing_subscriber::prelude::*;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
+use tracing_subscriber::{EnvFilter, layer::SubscriberExt, util::SubscriberInitExt};
 
 use logging::build_workspace_filter;
 use tokio::time::sleep;

testing/simulator/src/checks.rs

@@ -312,7 +312,9 @@ pub(crate) async fn verify_light_client_updates<E: EthSpec>(
             .signature_slot();
         let signature_slot_distance = slot - signature_slot;
         if signature_slot_distance > light_client_update_slot_tolerance {
-            return Err(format!("Existing optimistic update too old: signature slot {signature_slot}, current slot {slot:?}"));
+            return Err(format!(
+                "Existing optimistic update too old: signature slot {signature_slot}, current slot {slot:?}"
+            ));
         }
 
         // Verify light client finality update. `signature_slot_distance` should be 1 in the ideal scenario.

testing/simulator/src/cli.rs

@@ -1,4 +1,4 @@
-use clap::{crate_version, Arg, ArgAction, Command};
+use clap::{Arg, ArgAction, Command, crate_version};
 
 pub fn cli_app() -> Command {
     Command::new("simulator")

testing/simulator/src/fallback_sim.rs

@@ -1,5 +1,5 @@
 use crate::local_network::LocalNetworkParams;
-use crate::{checks, LocalNetwork};
+use crate::{LocalNetwork, checks};
 use clap::ArgMatches;
 
 use crate::retry::with_retry;
@@ -7,8 +7,9 @@ use environment::tracing_common;
 use futures::prelude::*;
 use logging::build_workspace_filter;
 use node_test_rig::{
+    ValidatorFiles,
     environment::{EnvironmentBuilder, LoggerConfig},
-    testing_validator_config, ValidatorFiles,
+    testing_validator_config,
 };
 use rayon::prelude::*;
 use std::cmp::max;
@@ -18,7 +19,7 @@ use std::time::Duration;
 use tokio::time::sleep;
 use tracing::Level;
 use tracing_subscriber::prelude::*;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
+use tracing_subscriber::{EnvFilter, layer::SubscriberExt, util::SubscriberInitExt};
 use types::{Epoch, EthSpec, MinimalEthSpec};
 const END_EPOCH: u64 = 16;
 const GENESIS_DELAY: u64 = 38;

testing/simulator/src/local_network.rs

@@ -1,10 +1,11 @@
 use crate::checks::epoch_delay;
 use kzg::trusted_setup::get_trusted_setup;
 use node_test_rig::{
+    ClientConfig, ClientGenesis, LocalBeaconNode, LocalExecutionNode, LocalValidatorClient,
+    MockExecutionConfig, MockServerConfig, ValidatorConfig, ValidatorFiles,
     environment::RuntimeContext,
-    eth2::{types::StateId, BeaconNodeHttpClient},
-    testing_client_config, ClientConfig, ClientGenesis, LocalBeaconNode, LocalExecutionNode,
-    LocalValidatorClient, MockExecutionConfig, MockServerConfig, ValidatorConfig, ValidatorFiles,
+    eth2::{BeaconNodeHttpClient, types::StateId},
+    testing_client_config,
 };
 use parking_lot::RwLock;
 use sensitive_url::SensitiveUrl;

testing/simulator/src/retry.rs

@@ -32,11 +32,7 @@ mod tests {
     use std::collections::VecDeque;
 
     async fn my_async_func(is_ok: bool) -> Result<(), ()> {
-        if is_ok {
-            Ok(())
-        } else {
-            Err(())
-        }
+        if is_ok { Ok(()) } else { Err(()) }
     }
 
     #[tokio::test]