Gets rid of blob classes. Close #66

test/cli/unit/test_teos_cli.py

@@ -7,7 +7,6 @@ from binascii import hexlify
 from coincurve import PrivateKey
 from requests.exceptions import ConnectionError, Timeout
 
-from common.blob import Blob
 import common.cryptographer
 from common.logger import Logger
 from common.tools import compute_locator
@@ -50,9 +49,7 @@ dummy_appointment_dict = {
     "start_time": dummy_appointment_data.get("start_time"),
     "end_time": dummy_appointment_data.get("end_time"),
     "to_self_delay": dummy_appointment_data.get("to_self_delay"),
-    "encrypted_blob": Cryptographer.encrypt(
-        Blob(dummy_appointment_data.get("tx")), dummy_appointment_data.get("tx_id")
-    ),
+    "encrypted_blob": Cryptographer.encrypt(dummy_appointment_data.get("tx"), dummy_appointment_data.get("tx_id")),
 }
 
 dummy_appointment = Appointment.from_dict(dummy_appointment_dict)

test/common/unit/test_appointment.py

@@ -3,12 +3,10 @@ import binascii
 from pytest import fixture
 
 from common.appointment import Appointment
-from common.encrypted_blob import EncryptedBlob
+from common.constants import LOCATOR_LEN_BYTES
 
 from test.common.unit.conftest import get_random_value_hex
 
-from common.constants import LOCATOR_LEN_BYTES
-
 
 # Not much to test here, adding it for completeness
 @fixture
@@ -46,7 +44,7 @@ def test_init_appointment(appointment_data):
         and appointment_data["start_time"] == appointment.start_time
         and appointment_data["end_time"] == appointment.end_time
         and appointment_data["to_self_delay"] == appointment.to_self_delay
-        and EncryptedBlob(appointment_data["encrypted_blob"]) == appointment.encrypted_blob
+        and appointment_data["encrypted_blob"] == appointment.encrypted_blob
     )
 
 
@@ -66,7 +64,7 @@ def test_to_dict(appointment_data):
         and appointment_data["start_time"] == dict_appointment["start_time"]
         and appointment_data["end_time"] == dict_appointment["end_time"]
         and appointment_data["to_self_delay"] == dict_appointment["to_self_delay"]
-        and EncryptedBlob(appointment_data["encrypted_blob"]) == EncryptedBlob(dict_appointment["encrypted_blob"])
+        and appointment_data["encrypted_blob"] == dict_appointment["encrypted_blob"]
     )
 
 
@@ -110,4 +108,4 @@ def test_serialize(appointment_data):
     assert struct.unpack(">I", start_time)[0] == appointment.start_time
     assert struct.unpack(">I", end_time)[0] == appointment.end_time
     assert struct.unpack(">I", to_self_delay)[0] == appointment.to_self_delay
-    assert binascii.hexlify(encrypted_blob).decode() == appointment.encrypted_blob.data
+    assert binascii.hexlify(encrypted_blob).decode() == appointment.encrypted_blob

test/common/unit/test_blob.py

@@ -1,18 +0,0 @@
-from binascii import unhexlify
-
-from common.blob import Blob
-from test.common.unit.conftest import get_random_value_hex
-
-
-def test_init_blob():
-    data = get_random_value_hex(64)
-    blob = Blob(data)
-    assert isinstance(blob, Blob)
-
-    # Wrong data
-    try:
-        Blob(unhexlify(get_random_value_hex(64)))
-        assert False, "Able to create blob with wrong data"
-
-    except ValueError:
-        assert True

test/common/unit/test_cryptographer.py

@@ -6,10 +6,8 @@ from cryptography.hazmat.primitives import serialization
 
 from coincurve import PrivateKey, PublicKey
 import common.cryptographer
-from common.blob import Blob
 from common.logger import Logger
 from common.cryptographer import Cryptographer
-from common.encrypted_blob import EncryptedBlob
 from test.common.unit.conftest import get_random_value_hex
 
 common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix="")
@@ -61,7 +59,7 @@ def test_check_data_key_format():
 
 
 def test_encrypt_odd_length_data():
-    blob = Blob(get_random_value_hex(64)[-1])
+    blob = get_random_value_hex(64)[-1]
     key = get_random_value_hex(32)
 
     try:
@@ -73,7 +71,7 @@ def test_encrypt_odd_length_data():
 
 
 def test_encrypt_wrong_key_size():
-    blob = Blob(get_random_value_hex(64))
+    blob = get_random_value_hex(64)
     key = get_random_value_hex(31)
 
     try:
@@ -85,15 +83,13 @@ def test_encrypt_wrong_key_size():
 
 
 def test_encrypt():
-    blob = Blob(data)
-
-    assert Cryptographer.encrypt(blob, key) == encrypted_data
+    assert Cryptographer.encrypt(data, key) == encrypted_data
 
 
 def test_decrypt_invalid_tag():
     random_key = get_random_value_hex(32)
     random_encrypted_data = get_random_value_hex(64)
-    random_encrypted_blob = EncryptedBlob(random_encrypted_data)
+    random_encrypted_blob = random_encrypted_data
 
     # Trying to decrypt random data should result in an InvalidTag exception. Our decrypt function
     # returns None
@@ -104,7 +100,7 @@ def test_decrypt_invalid_tag():
 def test_decrypt_odd_length_data():
     random_key = get_random_value_hex(32)
     random_encrypted_data_odd = get_random_value_hex(64)[:-1]
-    random_encrypted_blob_odd = EncryptedBlob(random_encrypted_data_odd)
+    random_encrypted_blob_odd = random_encrypted_data_odd
 
     try:
         Cryptographer.decrypt(random_encrypted_blob_odd, random_key)
@@ -117,7 +113,7 @@ def test_decrypt_odd_length_data():
 def test_decrypt_wrong_key_size():
     random_key = get_random_value_hex(31)
     random_encrypted_data_odd = get_random_value_hex(64)
-    random_encrypted_blob_odd = EncryptedBlob(random_encrypted_data_odd)
+    random_encrypted_blob_odd = random_encrypted_data_odd
 
     try:
         Cryptographer.decrypt(random_encrypted_blob_odd, random_key)
@@ -129,7 +125,7 @@ def test_decrypt_wrong_key_size():
 
 def test_decrypt():
     # Valid data should run with no InvalidTag and verify
-    assert Cryptographer.decrypt(EncryptedBlob(encrypted_data), key) == data
+    assert Cryptographer.decrypt(encrypted_data, key) == data
 
 
 def test_load_key_file():

test/common/unit/test_encrypted_blob.py

@@ -1,16 +0,0 @@
-from common.encrypted_blob import EncryptedBlob
-from test.common.unit.conftest import get_random_value_hex
-
-
-def test_init_encrypted_blob():
-    # No much to test here, basically that the object is properly created
-    data = get_random_value_hex(64)
-    assert EncryptedBlob(data).data == data
-
-
-def test_equal():
-    data = get_random_value_hex(64)
-    e_blob1 = EncryptedBlob(data)
-    e_blob2 = EncryptedBlob(data)
-
-    assert e_blob1 == e_blob2 and id(e_blob1) != id(e_blob2)

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