mirror of
https://github.com/ethereum/consensus-specs.git
synced 2026-02-03 05:34:55 -05:00
Simplify minimal SSZ again
This commit is contained in:
@@ -9,12 +9,8 @@ ZERO_CHUNK = b'\x00' * BYTES_PER_CHUNK
|
||||
cached_typedefs = {}
|
||||
|
||||
|
||||
def SSZType(name, fields):
|
||||
def SSZType(fields):
|
||||
class SSZObject():
|
||||
if name is not None:
|
||||
__name__ = name
|
||||
__qualname__ = name
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
for f, t in fields.items():
|
||||
if f not in kwargs:
|
||||
@@ -31,12 +27,9 @@ def SSZType(name, fields):
|
||||
def __str__(self):
|
||||
output = []
|
||||
for field in self.fields:
|
||||
output.append(f'{field}: {repr(getattr(self, field))},')
|
||||
output.append(f'{field}: {getattr(self, field)}')
|
||||
return "\n".join(output)
|
||||
|
||||
def __repr__(self):
|
||||
return name + "(**{\n " + str(self).replace("\n", "\n ") + "\n})"
|
||||
|
||||
def serialize(self):
|
||||
return serialize_value(self, self.__class__)
|
||||
|
||||
@@ -44,19 +37,9 @@ def SSZType(name, fields):
|
||||
return hash_tree_root(self, self.__class__)
|
||||
|
||||
SSZObject.fields = fields
|
||||
|
||||
if name is not None:
|
||||
cached_typedefs[name] = SSZObject
|
||||
|
||||
return SSZObject
|
||||
|
||||
|
||||
def SSZTypeExtension(original_type, new_fields):
|
||||
typedef = cached_typedefs[original_type]
|
||||
typedef.fields.update(new_fields)
|
||||
return typedef
|
||||
|
||||
|
||||
class Vector():
|
||||
def __init__(self, items):
|
||||
self.items = items
|
||||
@@ -334,7 +317,7 @@ def truncate(container):
|
||||
key: container.fields[key]
|
||||
for key in field_keys[:-1]
|
||||
}
|
||||
truncated_class = SSZType(None, truncated_fields)
|
||||
truncated_class = SSZType(truncated_fields)
|
||||
kwargs = {
|
||||
field: getattr(container, field)
|
||||
for field in field_keys[:-1]
|
||||
|
||||
Reference in New Issue
Block a user