Return length of msgpack encoded header instead of raw header

pull/35/head
tuxxy 2017-09-11 13:14:47 -07:00
parent 3c2fbac129
commit 5b4db3ac94
2 changed files with 6 additions and 6 deletions

View File

@ -84,8 +84,8 @@ class Client(object):
vers_bytes = version.to_bytes(4, byteorder='big')
num_keys_bytes = len(enc_keys).to_bytes(4, byteorder='big')
keys = b''.join(enc_keys)
header = vers_bytes + num_keys_bytes + keys
return (msgpack.dumps(header), len(header))
header = msgpack.dumps(vers_bytes + num_keys_bytes + keys)
return (header, len(header))
def _read_header(self, header):
"""

View File

@ -40,9 +40,9 @@ class TestClient(unittest.TestCase):
version = 100
header, length = self.client._build_header(enc_keys, version=version)
self.assertEqual(len(header), length)
try:
raw_header = msgpack.loads(header)
self.assertEqual(len(raw_header), length)
msgpack.loads(header)
except Exception as E:
self.fail("Failed to unpack header:\n{}".format(E))
@ -57,9 +57,9 @@ class TestClient(unittest.TestCase):
version = 100
header, length = self.client._build_header(enc_keys, version=version)
self.assertEqual(len(header), length)
try:
raw_header = msgpack.loads(header)
self.assertEqual(len(raw_header), length)
msgpack.loads(header)
except Exception as E:
self.fail("Failed to unpack header: {}".format(E))