Skip to content
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

fix containers, direct to field sedes elements, not the pair containing them #73

Closed
wants to merge 1 commit into from
Closed

fix containers, direct to field sedes elements, not the pair containing them #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ssz/sedes/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@to_tuple
def _deserialize_fixed_size_items_and_offsets(stream, field_sedes):
for sedes in field_sedes:
for _, sedes in field_sedes:
if sedes.is_fixed_sized:
field_size = sedes.get_fixed_size()
field_data = read_exact(field_size, stream)
Expand All @@ -51,21 +51,21 @@ def __init__(self, field_sedes: Sequence[TSedes]) -> None:
#
@property
def is_fixed_sized(self):
return all(field.is_fixed_sized for field in self.field_sedes)
return all(field.is_fixed_sized for _, field in self.field_sedes)

def get_fixed_size(self):
if not self.is_fixed_sized:
raise ValueError("Container contains dynamically sized elements")

return sum(field.get_fixed_size() for field in self.field_sedes)
return sum(field.get_fixed_size() for _, field in self.field_sedes)

#
# Serialization
#
def _get_item_sedes_pairs(self,
value: Sequence[Any],
) -> Tuple[Tuple[Any, TSedes], ...]:
return tuple(zip(value, self.field_sedes))
return tuple(zip(value, [sedes for _, sedes in self.field_sedes]))

def _validate_serializable(self, value: Sequence[Any]) -> bytes:
if len(value) != len(self.field_sedes):
Expand Down Expand Up @@ -131,7 +131,7 @@ def _deserialize_stream(self, stream: IO[bytes]) -> Tuple[Any, ...]:

value = tuple(
next(fixed_size_parts_iter) if sedes.is_fixed_sized else next(variable_size_parts_iter)
for sedes
for _, sedes
in self.field_sedes
)

Expand Down