Skip to content

fix: adding reserved prefix to decode #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: adding reserved prefix to decode #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9422c2
fix: adding reserve prefix to decode
hopinheimer May 31, 2025
03f8402
formatting
hopinheimer May 31, 2025
4354694
fix: removing some unwanted renaming of variables and added test
hopinheimer Jun 6, 2025
9cfe6dd
clippy changes
hopinheimer Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions ssz_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ fn ssz_decode_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> Tok
}

fixed_decodes.push(quote! {
let (slice, bytes) = bytes.split_at(#ssz_fixed_len);
let (slice, __bytes) = __bytes.split_at(#ssz_fixed_len);
let #ident = #from_ssz_bytes?;
});
is_fixed_lens.push(is_ssz_fixed_len);
Expand Down Expand Up @@ -848,11 +848,11 @@ fn ssz_decode_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> Tok
}
}

fn from_ssz_bytes(bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
fn from_ssz_bytes(__bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
if <Self as ssz::Decode>::is_ssz_fixed_len() {
if bytes.len() != <Self as ssz::Decode>::ssz_fixed_len() {
if __bytes.len() != <Self as ssz::Decode>::ssz_fixed_len() {
return Err(ssz::DecodeError::InvalidByteLength {
len: bytes.len(),
len: __bytes.len(),
expected: <Self as ssz::Decode>::ssz_fixed_len(),
});
}
Expand All @@ -867,7 +867,7 @@ fn ssz_decode_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> Tok
)*
})
} else {
let mut builder = ssz::SszDecoderBuilder::new(bytes);
let mut builder = ssz::SszDecoderBuilder::new(__bytes);

#(
#register_types
Expand Down Expand Up @@ -932,7 +932,7 @@ fn ssz_decode_derive_struct_transparent(
});
} else {
fields.push(quote! {
#name: <_>::from_ssz_bytes(bytes)?,
#name: <_>::from_ssz_bytes(__bytes)?,
});
wrapped_type = Some(ty);
}
Expand All @@ -944,7 +944,7 @@ fn ssz_decode_derive_struct_transparent(
});
} else {
fields.push(quote! {
#index:<_>::from_ssz_bytes(bytes)?,
#index:<_>::from_ssz_bytes(__bytes)?,
});
wrapped_type = Some(ty);
}
Expand All @@ -963,7 +963,7 @@ fn ssz_decode_derive_struct_transparent(
<#ty as ssz::Decode>::ssz_fixed_len()
}

fn from_ssz_bytes(bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
fn from_ssz_bytes(__bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
Ok(Self {
#(
#fields
Expand Down Expand Up @@ -1009,8 +1009,8 @@ fn ssz_decode_derive_enum_tag(derive_input: &DeriveInput, enum_data: &DataEnum)
1
}

fn from_ssz_bytes(bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
let byte = bytes
fn from_ssz_bytes(__bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
let byte = __bytes
.first()
.copied()
.ok_or(ssz::DecodeError::OutOfBoundsByte { i: 0 })?;
Expand Down Expand Up @@ -1061,12 +1061,12 @@ fn ssz_decode_derive_enum_union(derive_input: &DeriveInput, enum_data: &DataEnum
false
}

fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
fn from_ssz_bytes(__bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
// Sanity check to ensure the definition here does not drift from the one defined in
// `ssz`.
debug_assert_eq!(#MAX_UNION_SELECTOR, ssz::MAX_UNION_SELECTOR);

let (selector, body) = ssz::split_union_bytes(bytes)?;
let (selector, body) = ssz::split_union_bytes(__bytes)?;

match selector.into() {
#(
Expand Down Expand Up @@ -1128,9 +1128,9 @@ fn ssz_decode_derive_enum_transparent(
false
}

fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
fn from_ssz_bytes(__bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
#(
if let Ok(var) = <#var_types as ssz::Decode>::from_ssz_bytes(bytes) {
if let Ok(var) = <#var_types as ssz::Decode>::from_ssz_bytes(__bytes) {
return Ok(#constructors(var));
}
)*
Expand Down
16 changes: 16 additions & 0 deletions ssz_derive/tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,19 @@ fn transparent_struct_newtype_skipped_field_reverse() {
&vec![42_u8].as_ssz_bytes(),
);
}

#[derive(PartialEq, Debug, Encode, Decode)]
struct StructWithMoreThanOneFieldAndFirstFieldAsBytes {
bytes: Vec<u8>,
length: u8,
}

#[test]
fn struct_with_more_than_one_field_and_first_field_as_bytes() {
let test_struct = StructWithMoreThanOneFieldAndFirstFieldAsBytes {
bytes: vec![42_u8],
length: 7,
};

assert_encode_decode(&test_struct, &[5, 0, 0, 0, 7, 42]);
}