Gets rid of blob classes. Close #66

test/teos/e2e/test_basic_e2e.py

@@ -9,7 +9,6 @@ from cli.exceptions import TowerResponseError
 from cli import teos_cli, DATA_DIR, DEFAULT_CONF, CONF_FILE_NAME
 
 import common.cryptographer
-from common.blob import Blob
 from common.logger import Logger
 from common.tools import compute_locator
 from common.appointment import Appointment
@@ -245,7 +244,7 @@ def test_appointment_wrong_decryption_key(bitcoin_cli):
     # We can't use teos_cli.add_appointment here since it computes the locator internally, so let's do it manually.
     # We will encrypt the blob using the random value and derive the locator from the commitment tx.
     appointment_data["locator"] = compute_locator(bitcoin_cli.decoderawtransaction(commitment_tx).get("txid"))
-    appointment_data["encrypted_blob"] = Cryptographer.encrypt(Blob(penalty_tx), get_random_value_hex(32))
+    appointment_data["encrypted_blob"] = Cryptographer.encrypt(penalty_tx, get_random_value_hex(32))
     appointment = Appointment.from_dict(appointment_data)
 
     signature = Cryptographer.sign(appointment.serialize(), cli_sk)

test/teos/unit/conftest.py

@@ -20,7 +20,6 @@ from teos.block_processor import BlockProcessor
 from teos.appointments_dbm import AppointmentsDBM
 
 import common.cryptographer
-from common.blob import Blob
 from common.logger import Logger
 from common.tools import compute_locator
 from common.appointment import Appointment
@@ -138,9 +137,8 @@ def generate_dummy_appointment(real_height=True, start_time_offset=5, end_time_o
     }
 
     locator = compute_locator(dispute_txid)
-    blob = Blob(dummy_appointment_data.get("tx"))
 
-    encrypted_blob = Cryptographer.encrypt(blob, dummy_appointment_data.get("tx_id"))
+    encrypted_blob = Cryptographer.encrypt(dummy_appointment_data.get("tx"), dummy_appointment_data.get("tx_id"))
 
     appointment_data = {
         "locator": locator,

test/teos/unit/test_api.py

@@ -219,7 +219,7 @@ def test_add_appointment_registered_not_enough_free_slots(api, client, appointme
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
 
     # Let's create a big blob
-    appointment.encrypted_blob.data = TWO_SLOTS_BLOTS
+    appointment.encrypted_blob = TWO_SLOTS_BLOTS
 
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk
@@ -279,7 +279,7 @@ def test_add_appointment_update_same_size(api, client, appointment):
 
     # The user has no additional slots, but it should be able to update
     # Let's just reverse the encrypted blob for example
-    appointment.encrypted_blob.data = appointment.encrypted_blob.data[::-1]
+    appointment.encrypted_blob = appointment.encrypted_blob[::-1]
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk
@@ -298,7 +298,7 @@ def test_add_appointment_update_bigger(api, client, appointment):
     assert r.status_code == HTTP_OK and r.json.get("available_slots") == 1
 
     # The user has one slot, so it should be able to update as long as it only takes 1 additional slot
-    appointment.encrypted_blob.data = TWO_SLOTS_BLOTS
+    appointment.encrypted_blob = TWO_SLOTS_BLOTS
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk
@@ -307,7 +307,7 @@ def test_add_appointment_update_bigger(api, client, appointment):
 
     # Check that it'll fail if no enough slots are available
     # Double the size from before
-    appointment.encrypted_blob.data = TWO_SLOTS_BLOTS + TWO_SLOTS_BLOTS
+    appointment.encrypted_blob = TWO_SLOTS_BLOTS + TWO_SLOTS_BLOTS
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk
@@ -320,7 +320,7 @@ def test_add_appointment_update_smaller(api, client, appointment):
     api.gatekeeper.registered_users[compressed_client_pk] = {"available_slots": 2}
 
     # This should take 2 slots
-    appointment.encrypted_blob.data = TWO_SLOTS_BLOTS
+    appointment.encrypted_blob = TWO_SLOTS_BLOTS
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk
@@ -328,7 +328,7 @@ def test_add_appointment_update_smaller(api, client, appointment):
     assert r.status_code == HTTP_OK and r.json.get("available_slots") == 0
 
     # Let's update with one just small enough
-    appointment.encrypted_blob.data = "A" * (ENCRYPTED_BLOB_MAX_SIZE_HEX - 2)
+    appointment.encrypted_blob = "A" * (ENCRYPTED_BLOB_MAX_SIZE_HEX - 2)
     appointment_signature = Cryptographer.sign(appointment.serialize(), client_sk)
     r = add_appointment(
         client, {"appointment": appointment.to_dict(), "signature": appointment_signature}, compressed_client_pk

test/teos/unit/test_inspector.py

@@ -300,7 +300,7 @@ def test_inspect(run_bitcoind):
         and appointment.start_time == start_time
         and appointment.end_time == end_time
         and appointment.to_self_delay == to_self_delay
-        and appointment.encrypted_blob.data == encrypted_blob
+        and appointment.encrypted_blob == encrypted_blob
     )
 
 

test/teos/unit/test_watcher.py

@@ -278,7 +278,7 @@ def test_filter_valid_breaches(watcher):
     )
 
     dummy_appointment, _ = generate_dummy_appointment()
-    dummy_appointment.encrypted_blob.data = encrypted_blob
+    dummy_appointment.encrypted_blob = encrypted_blob
     dummy_appointment.locator = compute_locator(dispute_txid)
     uuid = uuid4().hex