Update Rust Edition to 2024 (#7766)

* #7749

Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
chonghe
2025-08-13 11:04:31 +08:00
committed by GitHub
parent bd6b8b6a65
commit 522bd9e9c6
468 changed files with 3594 additions and 3396 deletions

View File

@@ -4,9 +4,9 @@ use account_utils::{random_password_string, read_mnemonic_from_cli, read_passwor
use clap::{Arg, ArgAction, ArgMatches, Command};
use clap_utils::FLAG_HEADER;
use eth2::{
BeaconNodeHttpClient, SensitiveUrl, Timeouts,
lighthouse_vc::std_types::KeystoreJsonStr,
types::{StateId, ValidatorId},
BeaconNodeHttpClient, SensitiveUrl, Timeouts,
};
use eth2_wallet::WalletBuilder;
use serde::{Deserialize, Serialize};
@@ -439,17 +439,16 @@ impl ValidatorsAndDeposits {
different validator clients. If you understand the risks and are certain you \
wish to generate this validator again, omit the --{} flag.",
voting_public_key, derivation_index, BEACON_NODE_FLAG
))?
))?;
}
Ok(None) => {
eprintln!("{:?} was not found in the beacon chain", voting_public_key)
}
Ok(None) => eprintln!(
"{:?} was not found in the beacon chain",
voting_public_key
),
Err(e) => {
return Err(format!(
"Error checking if validator exists in beacon chain: {:?}",
e
))
));
}
}
}
@@ -591,7 +590,7 @@ pub mod tests {
use regex::Regex;
use std::path::Path;
use std::str::FromStr;
use tempfile::{tempdir, TempDir};
use tempfile::{TempDir, tempdir};
use tree_hash::TreeHash;
type E = MainnetEthSpec;