Skip to content
This repository has been archived by the owner on May 28, 2019. It is now read-only.

Commit

Permalink
xmr: serialization - serialize_archive removed
Browse files Browse the repository at this point in the history
- custom serialization routine is not required at this moment
  • Loading branch information
ph4r05 committed Oct 2, 2018
1 parent b98c2f8 commit 90065bd
Showing 1 changed file with 0 additions and 51 deletions.
51 changes: 0 additions & 51 deletions src/apps/monero/xmr/serialize/xmrserialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ def blob(self, elem=None, elem_type=None, params=None):
Loads/dumps blob
"""
elem_type = elem_type if elem_type else elem.__class__
if hasattr(elem_type, "serialize_archive"):
elem = elem_type() if elem is None else elem
return elem.serialize_archive(
self, elem=elem, elem_type=elem_type, params=params
)

if self.writing:
return dump_blob(self.iobj, elem=elem, elem_type=elem_type, params=params)
else:
Expand All @@ -138,12 +132,6 @@ def container(self, container=None, container_type=None, params=None):
"""
Loads/dumps container
"""
if hasattr(container_type, "serialize_archive"):
container = container_type() if container is None else container
return container.serialize_archive(
self, elem=container, elem_type=container_type, params=params
)

if self.writing:
return self._dump_container(self.iobj, container, container_type, params)
else:
Expand All @@ -155,9 +143,6 @@ def container_size(self, container_len=None, container_type=None, params=None):
"""
Container size
"""
if hasattr(container_type, "serialize_archive"):
raise ValueError("not supported")

if self.writing:
return self._dump_container_size(
self.iobj, container_len, container_type, params
Expand All @@ -169,8 +154,6 @@ def container_val(self, elem, container_type, params=None):
"""
Single cont value
"""
if hasattr(container_type, "serialize_archive"):
raise ValueError("not supported")
if self.writing:
return self._dump_container_val(self.iobj, elem, container_type, params)
else:
Expand All @@ -181,12 +164,6 @@ def variant(self, elem=None, elem_type=None, params=None, wrapped=None):
Loads/dumps variant type
"""
elem_type = elem_type if elem_type else elem.__class__
if hasattr(elem_type, "serialize_archive"):
elem = elem_type() if elem is None else elem
return elem.serialize_archive(
self, elem=elem, elem_type=elem_type, params=params
)

if self.writing:
return self._dump_variant(
self.iobj,
Expand All @@ -208,10 +185,6 @@ def message(self, msg, msg_type=None):
Loads/dumps message
"""
elem_type = msg_type if msg_type is not None else msg.__class__
if hasattr(elem_type, "serialize_archive"):
msg = elem_type() if msg is None else msg
return msg.serialize_archive(self)

if self.writing:
return self._dump_message(self.iobj, msg, msg_type=msg_type)
else:
Expand Down Expand Up @@ -239,22 +212,6 @@ def _get_type(self, elem_type):
if issubclass(elem_type, XmrType):
return elem_type

# Basic message types determined by the name.
# Due to unimport workflow the hierarchy linking may got lost.
etypes = (
UVarintType,
IntType,
BlobType,
UnicodeType,
VariantType,
ContainerType,
MessageType,
)
cname = elem_type.__name__
for e in etypes:
if cname == e.__name__:
return e

def _is_type(self, elem_type, test_type):
return issubclass(elem_type, test_type)

Expand Down Expand Up @@ -382,9 +339,6 @@ def _dump_message(self, writer, msg, msg_type=None):
"""
mtype = msg.__class__ if msg_type is None else msg_type
fields = mtype.f_specs()
if hasattr(mtype, "serialize_archive"):
raise ValueError("Cannot directly load, has to use archive with %s" % mtype)

for field in fields:
self._dump_message_field(writer, msg=msg, field=field)

Expand All @@ -395,11 +349,6 @@ def _load_message(self, reader, msg_type, msg=None):
"""
msg = msg_type() if msg is None else msg
fields = msg_type.f_specs() if msg_type else msg.__class__.f_specs()
if hasattr(msg_type, "serialize_archive"):
raise ValueError(
"Cannot directly load, has to use archive with %s" % msg_type
)

for field in fields:
self._load_message_field(reader, msg, field)

Expand Down

0 comments on commit 90065bd

Please sign in to comment.