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

Allow leading skipped tuple fields

Browse Source
This commit is contained in:
Paul Hauner
2023-01-09 15:56:17 +11:00
parent 33ff84743d
commit 026b5afbb9
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
consensus/ssz_derive/src/lib.rs
View File

@@ -147,7 +147,7 @@ use darling::{FromDeriveInput, FromMeta};
use proc_macro::TokenStream;
use quote::quote;
use std::convert::TryInto;
use syn::{parse_macro_input, DataEnum, DataStruct, DeriveInput, Ident};
use syn::{parse_macro_input, DataEnum, DataStruct, DeriveInput, Ident, Index};
/// The highest possible union selector value (higher values are reserved for backwards compatible
/// extensions).
@@ -442,11 +442,15 @@ fn ssz_encode_derive_struct_transparent(
);
}
let (ty, ident, _field_opts) = ssz_fields
let (index, (ty, ident, _field_opts)) = ssz_fields
.iter()
.find(|(_, _, field_opts)| !field_opts.skip_deserializing)
.enumerate()
.find(|(_, (_, _, field_opts))| !field_opts.skip_deserializing)
.expect("\"transparent\" struct must have at least one non-skipped field");
// Remove the `_usize` suffix from the value to avoid a compiler warning.
let index = Index::from(index);
let output = if let Some(field_name) = ident {
quote! {
impl #impl_generics ssz::Encode for #name #ty_generics #where_clause {
@@ -479,11 +483,11 @@ fn ssz_encode_derive_struct_transparent(
}
fn ssz_bytes_len(&self) -> usize {
self.0.ssz_bytes_len()
self.#index.ssz_bytes_len()
}
fn ssz_append(&self, buf: &mut Vec<u8>) {
self.0.ssz_append(buf)
self.#index.ssz_append(buf)
}
}
}