aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 14:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplifies Inspector using Appointment.from_json() constructor

Browse Source
This commit is contained in:
Sergi Delgado Segura
2019-11-07 16:35:55 +00:00
parent 8f7505c17a
commit 2b1640ea86
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pisa/appointment.py
View File

@@ -27,7 +27,8 @@ class Appointment:
encrypted_blob_data = appointment_data.get("encrypted_blob")
cipher = appointment_data.get("cipher")
hash_function = appointment_data.get("hash_function")
triggered = appointment_data.get("triggered")
triggered = True if appointment_data.get("triggered") is True else False
if any(
v is None

24
pisa/inspector.py
View File

@@ -16,34 +16,26 @@ logger = Logger("Inspector")
class Inspector:
def inspect(self, data):
locator = data.get("locator")
start_time = data.get("start_time")
end_time = data.get("end_time")
dispute_delta = data.get("dispute_delta")
encrypted_blob = data.get("encrypted_blob")
cipher = data.get("cipher")
hash_function = data.get("hash_function")
block_height = BlockProcessor.get_block_count()
if block_height is not None:
rcode, message = self.check_locator(locator)
rcode, message = self.check_locator(data.get("locator"))
if rcode == 0:
rcode, message = self.check_start_time(start_time, block_height)
rcode, message = self.check_start_time(data.get("start_time"), block_height)
if rcode == 0:
rcode, message = self.check_end_time(end_time, start_time, block_height)
rcode, message = self.check_end_time(data.get("end_time"), data.get("start_time"), block_height)
if rcode == 0:
rcode, message = self.check_delta(dispute_delta)
rcode, message = self.check_delta(data.get("dispute_delta"))
if rcode == 0:
rcode, message = self.check_blob(encrypted_blob)
rcode, message = self.check_blob(data.get("encrypted_blob"))
if rcode == 0:
rcode, message = self.check_cipher(cipher)
rcode, message = self.check_cipher(data.get("cipher"))
if rcode == 0:
rcode, message = self.check_hash_function(hash_function)
rcode, message = self.check_hash_function(data.get("hash_function"))
if rcode == 0:
r = Appointment(locator, start_time, end_time, dispute_delta, encrypted_blob, cipher, hash_function)
r = Appointment.from_dict(data)
else:
r = (rcode, message)