Refactors tests folder to separate different modules

Each module has a different folder and they do not share methods now. At some point they should be split in different repos

test/apps/cli/unit/conftest.py

@@ -0,0 +1,7 @@
+import random
+
+
+def get_random_value_hex(nbytes):
+    pseudo_random_value = random.getrandbits(8 * nbytes)
+    prv_hex = "{:x}".format(pseudo_random_value)
+    return prv_hex.zfill(2 * nbytes)

test/apps/cli/unit/test_pisa_cli.py

@@ -7,7 +7,7 @@ from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec
 
 import apps.cli.pisa_cli as pisa_cli
-from test.unit.conftest import get_random_value_hex
+from test.apps.cli.unit.conftest import get_random_value_hex
 
 # TODO: should find a way of doing without this
 from apps.cli.pisa_cli import build_appointment

test/common/unit/conftest.py

@@ -0,0 +1,7 @@
+import random
+
+
+def get_random_value_hex(nbytes):
+    pseudo_random_value = random.getrandbits(8 * nbytes)
+    prv_hex = "{:x}".format(pseudo_random_value)
+    return prv_hex.zfill(2 * nbytes)

test/common/unit/test_cryptographer.py

@@ -3,7 +3,7 @@ import binascii
 from apps.cli.blob import Blob
 from common.cryptographer import Cryptographer
 from pisa.encrypted_blob import EncryptedBlob
-from test.unit.conftest import get_random_value_hex
+from test.common.unit.conftest import get_random_value_hex
 
 data = "6097cdf52309b1b2124efeed36bd34f46dc1c25ad23ac86f28380f746254f777"
 key = "b2e984a570f6f49bc38ace178e09147b0aa296cbb7c92eb01412f7e2d07b5659"

test/pisa/unit/test_api.py

@@ -11,7 +11,7 @@ from pisa.tools import bitcoin_cli
 from pisa import HOST, PORT, c_logger
 from pisa.conf import MAX_APPOINTMENTS
 
-from test.unit.conftest import (
+from test.pisa.unit.conftest import (
     generate_block,
     generate_blocks,
     get_random_value_hex,

test/pisa/unit/test_appointment.py

@@ -5,7 +5,7 @@ from pisa import c_logger
 from pisa.appointment import Appointment
 from pisa.encrypted_blob import EncryptedBlob
 
-from test.unit.conftest import get_random_value_hex
+from test.pisa.unit.conftest import get_random_value_hex
 
 from common.constants import LOCATOR_LEN_BYTES
 

test/pisa/unit/test_blob.py

@@ -2,7 +2,7 @@ from binascii import unhexlify
 
 from pisa import c_logger
 from apps.cli.blob import Blob
-from test.unit.conftest import get_random_value_hex
+from test.pisa.unit.conftest import get_random_value_hex
 
 c_logger.disabled = True
 

test/pisa/unit/test_block_processor.py

@@ -2,7 +2,7 @@ import pytest
 
 from pisa import c_logger
 from pisa.block_processor import BlockProcessor
-from test.unit.conftest import get_random_value_hex, generate_block, generate_blocks
+from test.pisa.unit.conftest import get_random_value_hex, generate_block, generate_blocks
 
 c_logger.disabled = True
 

test/pisa/unit/test_builder.py

@@ -1,7 +1,7 @@
 from uuid import uuid4
 
 from pisa.builder import Builder
-from test.unit.conftest import get_random_value_hex, generate_dummy_appointment, generate_dummy_tracker
+from test.pisa.unit.conftest import get_random_value_hex, generate_dummy_appointment, generate_dummy_tracker
 
 
 def test_build_appointments():

test/pisa/unit/test_carrier.py

@@ -4,7 +4,7 @@ from pisa import c_logger
 from pisa.carrier import Carrier
 from test.simulator.utils import sha256d
 from test.simulator.transaction import TX
-from test.unit.conftest import generate_blocks, generate_block, get_random_value_hex
+from test.pisa.unit.conftest import generate_blocks, get_random_value_hex
 from pisa.rpc_errors import RPC_VERIFY_ALREADY_IN_CHAIN, RPC_DESERIALIZATION_ERROR
 
 c_logger.disabled = True

test/pisa/unit/test_cleaner.py

@@ -7,7 +7,7 @@ from pisa.cleaner import Cleaner
 from pisa.appointment import Appointment
 from pisa.db_manager import WATCHER_PREFIX
 
-from test.unit.conftest import get_random_value_hex
+from test.pisa.unit.conftest import get_random_value_hex
 
 from common.constants import LOCATOR_LEN_BYTES, LOCATOR_LEN_HEX
 

test/pisa/unit/test_db_manager.py

@@ -9,7 +9,7 @@ from pisa.db_manager import WATCHER_LAST_BLOCK_KEY, RESPONDER_LAST_BLOCK_KEY, LO
 
 from common.constants import LOCATOR_LEN_BYTES
 
-from test.unit.conftest import get_random_value_hex, generate_dummy_appointment
+from test.pisa.unit.conftest import get_random_value_hex, generate_dummy_appointment
 
 
 @pytest.fixture(scope="module")

test/pisa/unit/test_encrypted_blob.py

@@ -1,6 +1,6 @@
 from pisa import c_logger
 from pisa.encrypted_blob import EncryptedBlob
-from test.unit.conftest import get_random_value_hex
+from test.pisa.unit.conftest import get_random_value_hex
 
 c_logger.disabled = True
 

test/pisa/unit/test_inspector.py

@@ -11,7 +11,7 @@ from pisa.appointment import Appointment
 from pisa.block_processor import BlockProcessor
 from pisa.conf import MIN_TO_SELF_DELAY
 
-from test.unit.conftest import get_random_value_hex, generate_dummy_appointment_data, generate_keypair
+from test.pisa.unit.conftest import get_random_value_hex, generate_dummy_appointment_data, generate_keypair
 
 from common.constants import LOCATOR_LEN_BYTES, LOCATOR_LEN_HEX
 from common.cryptographer import Cryptographer

test/pisa/unit/test_responder.py

@@ -18,7 +18,7 @@ from common.tools import check_sha256_hex_format
 
 from test.simulator.utils import sha256d
 from test.simulator.bitcoind_sim import TX
-from test.unit.conftest import generate_block, generate_blocks, get_random_value_hex
+from test.pisa.unit.conftest import generate_block, generate_blocks, get_random_value_hex
 
 c_logger.disabled = True
 

test/pisa/unit/test_watcher.py

@@ -8,7 +8,7 @@ from pisa import c_logger
 from pisa.watcher import Watcher
 from pisa.responder import Responder
 from pisa.tools import bitcoin_cli
-from test.unit.conftest import (
+from test.pisa.unit.conftest import (
     generate_block,
     generate_blocks,
     generate_dummy_appointment,

test/simulator/test_bitcoin_sim.py

@@ -4,7 +4,7 @@ from time import sleep
 from threading import Thread
 
 from test.simulator.transaction import TX
-from test.unit.conftest import get_random_value_hex
+from test.pisa.unit import get_random_value_hex
 from test.simulator.bitcoind_sim import run_simulator
 from pisa.utils.auth_proxy import AuthServiceProxy, JSONRPCException
 from pisa.conf import BTC_RPC_USER, BTC_RPC_PASSWD, BTC_RPC_HOST, BTC_RPC_PORT