commit e5eb015771b66705d4e82a851843c1403b39439e Author: Dave Rolek dmr-x@riseup.net Date: Sun Jun 3 19:32:15 2018 +0000
Refactor: replace magic numbers (sizes) with identifiers
Move one of the attributes to a constant while sorting out a merge conflict. --- stem/client/cell.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/stem/client/cell.py b/stem/client/cell.py index 788c4c41..f464cb2d 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -50,6 +50,7 @@ from stem.util import _hash_attr, datetime_to_unix, str_tools
FIXED_PAYLOAD_LEN = 509 AUTH_CHALLENGE_SIZE = 32 +RELAY_DIGEST_SIZE = Size.LONG
STREAM_ID_REQUIRED = ( RelayCommand.BEGIN, @@ -322,9 +323,11 @@ class RelayCell(CircuitCell): # isinstance() isn't such a great option. With python2/python3 the # name is 'hashlib.HASH' whereas PyPy calls it just 'HASH'.
- digest = Size.LONG.unpack(digest.digest()[:4]) + digest_packed = digest.digest()[:RELAY_DIGEST_SIZE.size] + digest = RELAY_DIGEST_SIZE.unpack(digest_packed) elif stem.util._is_str(digest): - digest = Size.LONG.unpack(digest[:4]) + digest_packed = digest[:RELAY_DIGEST_SIZE.size] + digest = RELAY_DIGEST_SIZE.unpack(digest_packed) elif stem.util._is_int(digest): pass else: @@ -549,7 +552,7 @@ class NetinfoCell(Cell):
@classmethod def _unpack(cls, content, circ_id, link_protocol): - if len(content) < 4: + if len(content) < Size.LONG.size: raise ValueError('NETINFO cell expected to start with a timestamp')
timestamp, content = Size.LONG.pop(content) @@ -708,13 +711,14 @@ class AuthChallengeCell(Cell):
@classmethod def _unpack(cls, content, circ_id, link_protocol): - if len(content) < AUTH_CHALLENGE_SIZE + 2: - raise ValueError('AUTH_CHALLENGE payload should be at least 34 bytes, but was %i' % len(content)) + min_size = AUTH_CHALLENGE_SIZE + Size.SHORT.size + if len(content) < min_size: + raise ValueError('AUTH_CHALLENGE payload should be at least %i bytes, but was %i' % (min_size, len(content)))
challenge, content = split(content, AUTH_CHALLENGE_SIZE) method_count, content = Size.SHORT.pop(content)
- if len(content) < method_count * 2: + if len(content) < method_count * Size.SHORT.size: raise ValueError('AUTH_CHALLENGE should have %i methods, but only had %i bytes for it' % (method_count, len(content)))
methods = []