Moves EncryptedBlob to common

test/apps/cli/unit/test_wt_cli.py

@@ -14,7 +14,7 @@ from common.tools import compute_locator
 from common.appointment import Appointment
 from common.cryptographer import Cryptographer
 
-from apps.cli.blob import Blob
+from common.blob import Blob
 import apps.cli.wt_cli as wt_cli
 from test.apps.cli.unit.conftest import get_random_value_hex
 

test/common/unit/test_appointment.py

@@ -4,7 +4,7 @@ import binascii
 from pytest import fixture
 
 from common.appointment import Appointment
-from pisa.encrypted_blob import EncryptedBlob
+from common.encrypted_blob import EncryptedBlob
 
 from test.pisa.unit.conftest import get_random_value_hex
 

test/common/unit/test_blob.py

@@ -1,6 +1,6 @@
 from binascii import unhexlify
 
-from apps.cli.blob import Blob
+from common.blob import Blob
 from test.pisa.unit.conftest import get_random_value_hex
 
 

test/common/unit/test_cryptographer.py

@@ -5,10 +5,10 @@ from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
 
 import common.cryptographer
-from apps.cli.blob import Blob
+from common.blob import Blob
 from common.logger import Logger
 from common.cryptographer import Cryptographer
-from pisa.encrypted_blob import EncryptedBlob
+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="")

test/common/unit/test_encrypted_blob.py

@@ -1,4 +1,4 @@
-from pisa.encrypted_blob import EncryptedBlob
+from common.encrypted_blob import EncryptedBlob
 from test.pisa.unit.conftest import get_random_value_hex
 
 

test/pisa/e2e/test_basic_e2e.py

@@ -1,13 +1,11 @@
 import json
-import binascii
 from time import sleep
 from riemann.tx import Tx
 
 from pisa import config
 from pisa import HOST, PORT
 from apps.cli import wt_cli
-from apps.cli.blob import Blob
-from apps.cli import config as cli_conf
+from common.blob import Blob
 
 import common.cryptographer
 from common.logger import Logger

test/pisa/unit/conftest.py

@@ -11,7 +11,7 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
 
-from apps.cli.blob import Blob
+from common.blob import Blob
 from pisa.responder import TransactionTracker
 from pisa.tools import bitcoin_cli
 from pisa.db_manager import DBManager