gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-02 16:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yaml rust2 (#5635)

Browse Source 
* use yaml-rust2
This commit is contained in:
realbigsean
2024-04-24 02:02:10 -04:00
committed by GitHub
parent 61962898e2
commit c4a2bcb9c7
3 changed files with 43 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

424
Cargo.lock generated
View File

@@ -18,7 +18,7 @@ version = "0.3.5"
dependencies = [
"account_utils",
"bls",
"clap 2.34.0",
"clap",
"clap_utils",
"directory",
"environment",
@@ -292,54 +292,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "anstream"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]
[[package]]
name = "anyhow"
version = "1.0.82"
@@ -494,6 +446,12 @@ dependencies = [
"rand",
]
[[package]]
name = "arraydeque"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
[[package]]
name = "arrayref"
version = "0.3.7"
@@ -856,7 +814,7 @@ name = "beacon_node"
version = "5.1.3"
dependencies = [
"beacon_chain",
"clap 2.34.0",
"clap",
"clap_utils",
"client",
"directory",
@@ -1069,7 +1027,7 @@ name = "boot_node"
version = "5.1.3"
dependencies = [
"beacon_node",
"clap 2.34.0",
"clap",
"clap_utils",
"eth2_network_config",
"ethereum_ssz",
@@ -1345,38 +1303,11 @@ dependencies = [
"vec_map",
]
[[package]]
name = "clap"
version = "4.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim 0.11.1",
]
[[package]]
name = "clap_lex"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]]
name = "clap_utils"
version = "0.1.0"
dependencies = [
"clap 2.34.0",
"clap",
"dirs",
"eth2_network_config",
"ethereum-types 0.14.1",
@@ -1442,12 +1373,6 @@ dependencies = [
"cc",
]
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "compare_fields"
version = "0.2.0"
@@ -1473,19 +1398,6 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "console"
version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
"windows-sys 0.52.0",
]
[[package]]
name = "const-hex"
version = "1.11.3"
@@ -1568,7 +1480,7 @@ checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
dependencies = [
"atty",
"cast",
"clap 2.34.0",
"clap",
"criterion-plot",
"csv",
"itertools",
@@ -1783,18 +1695,8 @@ version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
dependencies = [
"darling_core 0.13.4",
"darling_macro 0.13.4",
]
[[package]]
name = "darling"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
"darling_core 0.14.4",
"darling_macro 0.14.4",
"darling_core",
"darling_macro",
]
[[package]]
@@ -1811,38 +1713,13 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "darling_core"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.10.0",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core 0.13.4",
"quote",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
"darling_core 0.14.4",
"darling_core",
"quote",
"syn 1.0.109",
]
@@ -1905,7 +1782,7 @@ version = "0.1.0"
dependencies = [
"beacon_chain",
"beacon_node",
"clap 2.34.0",
"clap",
"clap_utils",
"environment",
"hex",
@@ -2014,37 +1891,6 @@ dependencies = [
"syn 2.0.60",
]
[[package]]
name = "derive_builder"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
dependencies = [
"darling 0.14.4",
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "derive_builder_macro"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
dependencies = [
"derive_builder_core",
"syn 1.0.109",
]
[[package]]
name = "derive_more"
version = "0.99.17"
@@ -2058,19 +1904,6 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "dialoguer"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
dependencies = [
"console",
"shell-words",
"tempfile",
"thiserror",
"zeroize",
]
[[package]]
name = "diesel"
version = "2.1.6"
@@ -2142,7 +1975,7 @@ dependencies = [
name = "directory"
version = "0.1.0"
dependencies = [
"clap 2.34.0",
"clap",
"clap_utils",
"eth2_network_config",
]
@@ -2236,29 +2069,6 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dtt"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6b2dd9ee2d76888dc4c17d6da74629fa11b3cb1e8094fdc159b7f8ff259fc88"
dependencies = [
"regex",
"serde",
"time",
]
[[package]]
name = "duct"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c"
dependencies = [
"libc",
"once_cell",
"os_pipe",
"shared_child",
]
[[package]]
name = "dunce"
version = "1.0.4"
@@ -2396,12 +2206,6 @@ dependencies = [
"zeroize",
]
[[package]]
name = "encode_unicode"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
version = "0.8.34"
@@ -2442,16 +2246,6 @@ dependencies = [
"syn 2.0.60",
]
[[package]]
name = "env_filter"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
dependencies = [
"log",
"regex",
]
[[package]]
name = "env_logger"
version = "0.8.4"
@@ -2475,19 +2269,6 @@ dependencies = [
"termcolor",
]
[[package]]
name = "env_logger"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
dependencies = [
"anstream",
"anstyle",
"env_filter",
"humantime",
"log",
]
[[package]]
name = "environment"
version = "0.1.2"
@@ -2675,7 +2456,7 @@ dependencies = [
"sha2 0.9.9",
"tempfile",
"unicode-normalization",
"uuid 0.8.2",
"uuid",
"zeroize",
]
@@ -2715,7 +2496,7 @@ dependencies = [
"serde_repr",
"tempfile",
"tiny-bip39",
"uuid 0.8.2",
"uuid",
]
[[package]]
@@ -2859,7 +2640,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6085d7fd3cf84bd2b8fec150d54c8467fb491d8db9c460607c5534f653a0ee38"
dependencies = [
"darling 0.13.4",
"darling",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -3172,12 +2953,6 @@ dependencies = [
"rustc_version 0.4.0",
]
[[package]]
name = "figlet-rs"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4742a071cd9694fc86f9fa1a08fa3e53d40cc899d7ee532295da2d085639fbc5"
[[package]]
name = "filesystem"
version = "0.1.0"
@@ -3283,12 +3058,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "fs_extra"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "funty"
version = "1.1.0"
@@ -4286,7 +4055,7 @@ version = "0.2.0"
dependencies = [
"bytes",
"hex",
"serde_yml",
"yaml-rust2",
]
[[package]]
@@ -4510,7 +4279,7 @@ dependencies = [
"account_utils",
"beacon_chain",
"bls",
"clap 2.34.0",
"clap",
"clap_utils",
"deposit_contract",
"directory",
@@ -5088,7 +4857,7 @@ dependencies = [
"beacon_processor",
"bls",
"boot_node",
"clap 2.34.0",
"clap",
"clap_utils",
"database_manager",
"directory",
@@ -5436,7 +5205,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37cb4045d5677b7da537f8cb5d0730d5b6414e3cc81c61e4b50e1f0cbdc73909"
dependencies = [
"darling 0.13.4",
"darling",
"itertools",
"proc-macro2",
"quote",
@@ -6044,16 +5813,6 @@ dependencies = [
"types",
]
[[package]]
name = "os_pipe"
version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "overload"
version = "0.1.1"
@@ -7086,30 +6845,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "rlg"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6ccf670238310d5c31a52fed1a3314620d037a64f1e5fbdc71b2c50909134dc"
dependencies = [
"dtt",
"tokio",
"vrd 0.0.4",
]
[[package]]
name = "rlg"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e02c717e23f67b23032a4acb01cf63534d6259938d592e6d2451c02f09fc368"
dependencies = [
"dtt",
"hostname",
"serde_json",
"tokio",
"vrd 0.0.5",
]
[[package]]
name = "rlp"
version = "0.5.2"
@@ -7687,7 +7422,7 @@ version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling 0.13.4",
"darling",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -7706,27 +7441,6 @@ dependencies = [
"unsafe-libyaml",
]
[[package]]
name = "serde_yml"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "196c3750ff0411738366b0d9534ca55fc74d04a3d4284a450039de950bd11938"
dependencies = [
"dtt",
"env_logger 0.11.3",
"figlet-rs",
"indexmap 2.2.6",
"itoa",
"log",
"openssl",
"rlg 0.0.3",
"ryu",
"serde",
"unsafe-libyaml",
"uuid 1.8.0",
"xtasks",
]
[[package]]
name = "sha1"
version = "0.10.6"
@@ -7803,22 +7517,6 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "shared_child"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "shell-words"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
[[package]]
name = "shlex"
version = "1.3.0"
@@ -7870,7 +7568,7 @@ dependencies = [
name = "simulator"
version = "0.2.0"
dependencies = [
"clap 2.34.0",
"clap",
"env_logger 0.9.3",
"eth1",
"eth2_network_config",
@@ -8282,12 +7980,6 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strsim"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.24.1"
@@ -8322,7 +8014,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f4e1f478a7728f8855d7e620e9a152cf8932c6614f86564c886f9b8141f3201"
dependencies = [
"darling 0.13.4",
"darling",
"itertools",
"proc-macro2",
"quote",
@@ -8691,7 +8383,6 @@ dependencies = [
"libc",
"mio",
"num_cpus",
"parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.6",
@@ -9022,7 +8713,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce7bccc538359a213436af7bc95804bdbf1c2a21d80e22953cbe9e096837ff1"
dependencies = [
"darling 0.13.4",
"darling",
"quote",
"syn 1.0.109",
]
@@ -9270,12 +8961,6 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
version = "0.8.2"
@@ -9286,15 +8971,6 @@ dependencies = [
"serde",
]
[[package]]
name = "uuid"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
dependencies = [
"getrandom",
]
[[package]]
name = "validator_client"
version = "0.3.5"
@@ -9302,7 +8978,7 @@ dependencies = [
"account_utils",
"bincode",
"bls",
"clap 2.34.0",
"clap",
"clap_utils",
"deposit_contract",
"directory",
@@ -9374,7 +9050,7 @@ version = "0.1.0"
dependencies = [
"account_utils",
"bls",
"clap 2.34.0",
"clap",
"clap_utils",
"environment",
"eth2",
@@ -9423,25 +9099,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]]
name = "vrd"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a81b8b5b404f3d7afa1b8142a6bc980c20cd68556c634c3db517871aa0402521"
dependencies = [
"rand",
]
[[package]]
name = "vrd"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee1067b8d17481f5be71b59d11c329e955ffe36348907e0a4a41b619682bb4af"
dependencies = [
"rand",
"serde",
]
[[package]]
name = "wait-timeout"
version = "0.2.0"
@@ -9634,7 +9291,7 @@ dependencies = [
"beacon_node",
"bls",
"byteorder",
"clap 2.34.0",
"clap",
"diesel",
"diesel_migrations",
"env_logger 0.9.3",
@@ -10099,23 +9756,14 @@ dependencies = [
]
[[package]]
name = "xtasks"
version = "0.0.2"
name = "yaml-rust2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "940db5674e301470e6cd91098b2c68a1fad751a1623575d1133f7456146e6d2f"
checksum = "498f4d102a79ea1c9d4dd27573c0fc96ad74c023e8da38484e47883076da25fb"
dependencies = [
"anyhow",
"clap 4.5.4",
"derive_builder",
"dialoguer",
"dtt",
"duct",
"fs_extra",
"glob",
"rlg 0.0.2",
"serde",
"serde_json",
"vrd 0.0.5",
"arraydeque",
"encoding_rs",
"hashlink",
]
[[package]]

2
consensus/int_to_bytes/Cargo.toml
View File

@@ -8,5 +8,5 @@ edition = { workspace = true }
bytes = { workspace = true }
[dev-dependencies]
yaml-rust2 = "0.8"
hex = { workspace = true }
serde_yml = "0.0.4"

10
consensus/int_to_bytes/src/lib.rs
View File

@@ -78,7 +78,8 @@ pub fn int_to_bytes96(int: u64) -> Vec<u8> {
#[cfg(test)]
mod tests {
use super::*;
use std::{collections::HashMap, fs::File, io::prelude::*, path::PathBuf};
use std::{fs::File, io::prelude::*, path::PathBuf};
use yaml_rust2::yaml;
#[test]
fn fixed_bytes32() {
@@ -110,13 +111,14 @@ mod tests {
file.read_to_string(&mut yaml_str).unwrap();
let docs: HashMap<String, serde_yml::Value> = serde_yml::from_str(&yaml_str).unwrap();
let test_cases = docs["test_cases"].as_sequence().unwrap();
let docs = yaml::YamlLoader::load_from_str(&yaml_str).unwrap();
let doc = &docs[0];
let test_cases = doc["test_cases"].as_vec().unwrap();
for test_case in test_cases {
let byte_length = test_case["byte_length"].as_i64().unwrap() as u64;
let int = test_case["int"].as_i64().unwrap() as u64;
let bytes_string = test_case["bytes"].as_str().unwrap();
let bytes_string = test_case["bytes"].clone().into_string().unwrap();
let bytes = hex::decode(bytes_string.replace("0x", "")).unwrap();
match byte_length {