Temporal fix for Cryptographer logs. Close #91

test/apps/cli/unit/test_wt_cli.py

@@ -1,4 +1,3 @@
-import pytest
 import responses
 import json
 import os
@@ -9,6 +8,8 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ec
 
+import common.cryptographer
+from common.logger import Logger
 from common.tools import compute_locator
 from common.appointment import Appointment
 from common.cryptographer import Cryptographer
@@ -17,6 +18,8 @@ from apps.cli.blob import Blob
 import apps.cli.wt_cli as wt_cli
 from test.apps.cli.unit.conftest import get_random_value_hex
 
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=wt_cli.LOG_PREFIX)
+
 # dummy keys for the tests
 dummy_sk = ec.generate_private_key(ec.SECP256K1, default_backend())
 dummy_pk = dummy_sk.public_key()

test/common/unit/test_cryptographer.py

@@ -1,15 +1,18 @@
 import os
-import pytest
 import binascii
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
 
+import common.cryptographer
 from apps.cli.blob import Blob
+from common.logger import Logger
 from common.cryptographer import Cryptographer
 from pisa.encrypted_blob import EncryptedBlob
 from test.common.unit.conftest import get_random_value_hex
 
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix="")
+
 data = "6097cdf52309b1b2124efeed36bd34f46dc1c25ad23ac86f28380f746254f777"
 key = "b2e984a570f6f49bc38ace178e09147b0aa296cbb7c92eb01412f7e2d07b5659"
 encrypted_data = "8f31028097a8bf12a92e088caab5cf3fcddf0d35ed2b72c24b12269373efcdea04f9d2a820adafe830c20ff132d89810"

test/pisa/e2e/test_basic_e2e.py

@@ -7,6 +7,9 @@ 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
+
+import common.cryptographer
+from common.logger import Logger
 from common.tools import compute_locator
 from common.appointment import Appointment
 from common.cryptographer import Cryptographer
@@ -19,6 +22,8 @@ from test.pisa.e2e.conftest import (
     run_pisad,
 )
 
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix="")
+
 # We'll use wt_cli to add appointments. The expected input format is a list of arguments with a json-encoded
 # appointment
 wt_cli.pisa_api_server = HOST

test/pisa/unit/conftest.py

@@ -22,9 +22,14 @@ from bitcoind_mock.transaction import create_dummy_transaction
 from bitcoind_mock.bitcoind import BitcoindMock
 from bitcoind_mock.conf import BTC_RPC_HOST, BTC_RPC_PORT
 
+from pisa import LOG_PREFIX
+import common.cryptographer
+from common.logger import Logger
 from common.constants import LOCATOR_LEN_HEX
 from common.cryptographer import Cryptographer
 
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=LOG_PREFIX)
+
 
 @pytest.fixture(scope="session")
 def run_bitcoind():

test/pisa/unit/test_inspector.py

@@ -14,6 +14,12 @@ from test.pisa.unit.conftest import get_random_value_hex, generate_dummy_appoint
 
 from common.constants import LOCATOR_LEN_BYTES, LOCATOR_LEN_HEX
 from common.cryptographer import Cryptographer
+from common.logger import Logger
+
+from pisa import LOG_PREFIX
+import common.cryptographer
+
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=LOG_PREFIX)
 
 
 inspector = Inspector(get_config())

test/pisa/unit/test_watcher.py

@@ -20,9 +20,14 @@ from test.pisa.unit.conftest import (
 )
 from pisa.conf import EXPIRY_DELTA, MAX_APPOINTMENTS
 
+import common.cryptographer
+from pisa import LOG_PREFIX
+from common.logger import Logger
 from common.tools import compute_locator
 from common.cryptographer import Cryptographer
 
+common.cryptographer.logger = Logger(actor="Cryptographer", log_name_prefix=LOG_PREFIX)
+
 
 APPOINTMENTS = 5
 START_TIME_OFFSET = 1