gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 20:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove selector attribute duplication! Yay!

Browse Source
This commit is contained in:
Michael Sproul
2026-01-13 12:47:43 +11:00
parent e98b6db3f6
commit ecd207f421
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Cargo.lock generated
View File

@@ -3057,7 +3057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -4675,7 +4675,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
dependencies = [ dependencies = [
"hermit-abi", "hermit-abi",
"libc", "libc",
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -6270,7 +6270,7 @@ version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -7179,7 +7179,7 @@ dependencies = [
"once_cell", "once_cell",
"socket2 0.6.1", "socket2 0.6.1",
"tracing", "tracing",
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -7674,7 +7674,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.4.15", "linux-raw-sys 0.4.15",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@@ -7687,7 +7687,7 @@ dependencies = [
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.11.0", "linux-raw-sys 0.11.0",
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -8753,7 +8753,7 @@ dependencies = [
"getrandom 0.3.4", "getrandom 0.3.4",
"once_cell", "once_cell",
"rustix 1.1.2", "rustix 1.1.2",
"windows-sys 0.59.0", "windows-sys 0.60.2",
] ]
[[package]] [[package]]
@@ -9324,7 +9324,7 @@ dependencies = [
[[package]] [[package]]
name = "tree_hash" name = "tree_hash"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/sigp/tree_hash?branch=progressive#2fd80712e4d85e5f61dc574d8f5837a5c9b355b8" source = "git+https://github.com/sigp/tree_hash?branch=progressive#4f7349913ba9ac8cce7112b2279364f8fcac1f5d"
dependencies = [ dependencies = [
"alloy-primitives", "alloy-primitives",
"ethereum_hashing", "ethereum_hashing",
@@ -9336,7 +9336,7 @@ dependencies = [
[[package]] [[package]]
name = "tree_hash_derive" name = "tree_hash_derive"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/sigp/tree_hash?branch=progressive#2fd80712e4d85e5f61dc574d8f5837a5c9b355b8" source = "git+https://github.com/sigp/tree_hash?branch=progressive#4f7349913ba9ac8cce7112b2279364f8fcac1f5d"
dependencies = [ dependencies = [
"darling 0.21.3", "darling 0.21.3",
"proc-macro2", "proc-macro2",

7
testing/ef_tests/src/cases/ssz_generic.rs
View File

@@ -431,7 +431,6 @@ struct ProgressiveComplexTestStruct {
#[context_deserialize(ForkName)] #[context_deserialize(ForkName)]
enum CompatibleUnionA { enum CompatibleUnionA {
#[ssz(selector = "1")] #[ssz(selector = "1")]
#[tree_hash(selector = "1")]
ProgressiveSingleFieldContainerTestStruct(ProgressiveSingleFieldContainerTestStruct), ProgressiveSingleFieldContainerTestStruct(ProgressiveSingleFieldContainerTestStruct),
} }
@@ -441,10 +440,8 @@ enum CompatibleUnionA {
#[context_deserialize(ForkName)] #[context_deserialize(ForkName)]
enum CompatibleUnionBC { enum CompatibleUnionBC {
#[ssz(selector = "2")] #[ssz(selector = "2")]
#[tree_hash(selector = "2")]
ProgressiveSingleListContainerTestStruct(ProgressiveSingleListContainerTestStruct), ProgressiveSingleListContainerTestStruct(ProgressiveSingleListContainerTestStruct),
#[ssz(selector = "3")] #[ssz(selector = "3")]
#[tree_hash(selector = "3")]
ProgressiveVarTestStruct(ProgressiveVarTestStruct), ProgressiveVarTestStruct(ProgressiveVarTestStruct),
} }
@@ -454,16 +451,12 @@ enum CompatibleUnionBC {
#[context_deserialize(ForkName)] #[context_deserialize(ForkName)]
enum CompatibleUnionABCA { enum CompatibleUnionABCA {
#[ssz(selector = "1")] #[ssz(selector = "1")]
#[tree_hash(selector = "1")]
A1(ProgressiveSingleFieldContainerTestStruct), A1(ProgressiveSingleFieldContainerTestStruct),
#[ssz(selector = "2")] #[ssz(selector = "2")]
#[tree_hash(selector = "2")]
B1(ProgressiveSingleListContainerTestStruct), B1(ProgressiveSingleListContainerTestStruct),
#[ssz(selector = "3")] #[ssz(selector = "3")]
#[tree_hash(selector = "3")]
C1(ProgressiveVarTestStruct), C1(ProgressiveVarTestStruct),
#[ssz(selector = "4")] #[ssz(selector = "4")]
#[tree_hash(selector = "4")]
A2(ProgressiveSingleFieldContainerTestStruct), A2(ProgressiveSingleFieldContainerTestStruct),
} }