python fixes, tests

This commit is contained in:
Ethan Buchman
2015-12-14 18:00:18 -05:00
parent bb4a58aa0a
commit af2a1a6fc1
8 changed files with 103 additions and 51 deletions

View File

@ -38,9 +38,12 @@ class CounterAppContext():
def append_tx(self, txBytes):
if self.serial:
txValue = decode_big_endian(BytesReader(txBytes), len(txBytes))
txByteArray = bytearray(txBytes)
if len(txBytes) >= 2 and txBytes[:2] == "0x":
txByteArray = hex2bytes(txBytes[2:])
txValue = decode_big_endian(BytesReader(txByteArray), len(txBytes))
if txValue != self.txCount:
return [], 1
return None, 1
self.txCount += 1
return None, 0
@ -48,7 +51,9 @@ class CounterAppContext():
self.hashCount += 1
if self.txCount == 0:
return "", 0
return str(encode_big_endian(self.txCount, 8)), 0
h = encode_big_endian(self.txCount, 8)
h.reverse()
return str(h), 0
def commit(self):
return 0

View File

@ -6,6 +6,7 @@ class BytesReader():
def read(self, n):
if len(self.buf) < n:
print "reader err: buf less than n"
# TODO: exception
return
r = self.buf[:n]

View File

@ -77,9 +77,9 @@ class TMSPServer():
ret_code = res
res = None
print "called", req_type, "ret code:", ret_code
if ret_code != 0:
print "non-zero retcode:", ret_code
return
if req_type in ("echo", "info"): # these dont return a ret code
response += bytearray([resTypeByte]) + encode(res)

View File

@ -2,6 +2,9 @@
# the decoder works off a reader
# the encoder returns bytearray
def hex2bytes(h):
return bytearray(h.decode('hex'))
def bytes2hex(b):
if type(b) in (str, unicode):
return "".join([hex(ord(c))[2:].zfill(2) for c in b])