Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

Unify types of exceptions raised during message parsing

Browse Source
This commit is contained in:
TheKysek 2016-10-16 13:14:32 +02:00
parent 3fd0334fbe
commit 29ebdc44c9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/message.py
View File

@ -127,8 +127,8 @@ class Version(object):
payload = payload[user_agent_length:] payload = payload[user_agent_length:]
# Assume it is stream 1 if payload != b'\x01\x01':
assert payload == b'\x01\x01' raise ValueError('message not for stream 1')
return cls(host, port, protocol_version, services, nonce, user_agent) return cls(host, port, protocol_version, services, nonce, user_agent)
@ -158,7 +158,8 @@ class Inv(object):
vectors.add(payload[:32]) vectors.add(payload[:32])
payload = payload[32:] payload = payload[32:]
assert vector_count == len(vectors) if vector_count != len(vectors):
raise ValueError('malformed Inv message, wrong vector_count')
return cls(vectors) return cls(vectors)
@ -188,6 +189,9 @@ class GetData(object):
vectors.add(payload[:32]) vectors.add(payload[:32])
payload = payload[32:] payload = payload[32:]
if vector_count != len(vectors):
raise ValueError('malformed GetData message, wrong vector_count')
return cls(vectors) return cls(vectors)