gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-20 22:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into gloas-walk-always

Browse Source
This commit is contained in:
Michael Sproul
2026-03-30 16:10:35 +11:00
parent 12f5ab04f3 5efaf85c90
commit 4c3fd70dbf
37 changed files with 287 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/ef_tests/Cargo.toml
View File

@@ -32,7 +32,6 @@ rayon = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_repr = { workspace = true }
serde_yaml = { workspace = true }
snap = { workspace = true }
ssz_types = { workspace = true }
state_processing = { workspace = true }
@@ -41,3 +40,4 @@ tree_hash = { workspace = true }
tree_hash_derive = { workspace = true }
typenum = { workspace = true }
types = { workspace = true }
yaml_serde = { workspace = true }

4
testing/ef_tests/src/decode.rs
View File

@@ -33,14 +33,14 @@ pub fn log_file_access<P: AsRef<Path>>(file_accessed: P) {
}
pub fn yaml_decode<T: serde::de::DeserializeOwned>(string: &str) -> Result<T, Error> {
serde_yaml::from_str(string).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))
yaml_serde::from_str(string).map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))
}
pub fn context_yaml_decode<'de, T, C>(string: &'de str, context: C) -> Result<T, Error>
where
T: ContextDeserialize<'de, C>,
{
let deserializer = serde_yaml::Deserializer::from_str(string);
let deserializer = yaml_serde::Deserializer::from_str(string);
T::context_deserialize(deserializer, context)
.map_err(|e| Error::FailedToParseTest(format!("{:?}", e)))
}

2
testing/web3signer_tests/Cargo.toml
View File

@@ -23,7 +23,6 @@ parking_lot = { workspace = true }
reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
slashing_protection = { workspace = true }
slot_clock = { workspace = true }
ssz_types = { workspace = true }
@@ -33,4 +32,5 @@ tokio = { workspace = true }
types = { workspace = true }
url = { workspace = true }
validator_store = { workspace = true }
yaml_serde = { workspace = true }
zip = { workspace = true }

2
testing/web3signer_tests/src/lib.rs
View File

@@ -210,7 +210,7 @@ mod tests {
};
let key_config_file =
File::create(keystore_dir.path().join("key-config.yaml")).unwrap();
serde_yaml::to_writer(key_config_file, &key_config).unwrap();
yaml_serde::to_writer(key_config_file, &key_config).unwrap();
let tls_keystore_file = tls_dir().join("web3signer").join("key.p12");
let tls_keystore_password_file = tls_dir().join("web3signer").join("password.txt");