Move config options used by watcher and responder to the constructor

test/pisa/unit/conftest.py

@@ -147,3 +147,26 @@ def generate_dummy_tracker():
     )
 
     return TransactionTracker.from_dict(tracker_data)
+
+
+def get_config():
+    config = {
+        "BTC_RPC_USER": "username",
+        "BTC_RPC_PASSWD": "password",
+        "BTC_RPC_HOST": "localhost",
+        "BTC_RPC_PORT": 8332,
+        "BTC_NETWORK": "regtest",
+        "FEED_PROTOCOL": "tcp",
+        "FEED_ADDR": "127.0.0.1",
+        "FEED_PORT": 28332,
+        "MAX_APPOINTMENTS": 100,
+        "EXPIRY_DELTA": 6,
+        "MIN_TO_SELF_DELAY": 20,
+        "SERVER_LOG_FILE": "pisa.log",
+        "PISA_SECRET_KEY": "pisa_sk.der",
+        "CLIENT_LOG_FILE": "pisa.log",
+        "TEST_LOG_FILE": "test.log",
+        "DB_PATH": "appointments",
+    }
+
+    return config

test/pisa/unit/test_api.py

@@ -9,7 +9,7 @@ from pisa.api import API
 from pisa.watcher import Watcher
 from pisa.tools import bitcoin_cli
 from pisa import HOST, PORT
-from pisa.conf import MAX_APPOINTMENTS
+from pisa.conf import MAX_APPOINTMENTS, EXPIRY_DELTA
 
 from test.pisa.unit.conftest import (
     generate_block,
@@ -17,6 +17,7 @@ from test.pisa.unit.conftest import (
     get_random_value_hex,
     generate_dummy_appointment_data,
     generate_keypair,
+    get_config,
 )
 
 from common.constants import LOCATOR_LEN_BYTES
@@ -37,7 +38,7 @@ def run_api(db_manager):
         format=serialization.PrivateFormat.TraditionalOpenSSL,
         encryption_algorithm=serialization.NoEncryption(),
     )
-    watcher = Watcher(db_manager, sk_der)
+    watcher = Watcher(db_manager, sk_der, get_config())
 
     api_thread = Thread(target=API(watcher).start)
     api_thread.daemon = True

test/pisa/unit/test_responder.py

@@ -17,12 +17,12 @@ from common.tools import check_sha256_hex_format
 
 from bitcoind_mock.utils import sha256d
 from bitcoind_mock.transaction import TX
-from test.pisa.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, get_config
 
 
 @pytest.fixture(scope="module")
 def responder(db_manager):
-    return Responder(db_manager)
+    return Responder(db_manager, get_config())
 
 
 @pytest.fixture()
@@ -151,11 +151,12 @@ def test_init_responder(responder):
     assert type(responder.missed_confirmations) is dict and len(responder.missed_confirmations) == 0
     assert responder.block_queue.empty()
     assert responder.asleep is True
+    assert type(responder.config) is dict
     assert responder.zmq_subscriber is None
 
 
 def test_handle_breach(db_manager):
-    responder = Responder(db_manager)
+    responder = Responder(db_manager, get_config())
     uuid = uuid4().hex
     tracker = create_dummy_tracker()
 
@@ -295,7 +296,7 @@ def test_do_subscribe(responder):
 
 
 def test_do_watch(temp_db_manager):
-    responder = Responder(temp_db_manager)
+    responder = Responder(temp_db_manager, get_config())
     responder.block_queue = Queue()
 
     zmq_thread = Thread(target=responder.do_subscribe)
@@ -351,7 +352,7 @@ def test_do_watch(temp_db_manager):
 
 
 def test_check_confirmations(temp_db_manager):
-    responder = Responder(temp_db_manager)
+    responder = Responder(temp_db_manager, get_config())
     responder.block_queue = Queue()
 
     zmq_thread = Thread(target=responder.do_subscribe)
@@ -414,7 +415,7 @@ def test_get_completed_trackers(db_manager):
     initial_height = bitcoin_cli().getblockcount()
 
     # Let's use a fresh responder for this to make it easier to compare the results
-    responder = Responder(db_manager)
+    responder = Responder(db_manager, get_config())
 
     # A complete tracker is a tracker that has reached the appointment end with enough confirmations (> MIN_CONFIRMATIONS)
     # We'll create three type of transactions: end reached + enough conf, end reached + no enough conf, end not reached
@@ -462,7 +463,7 @@ def test_get_completed_trackers(db_manager):
 
 
 def test_rebroadcast(db_manager):
-    responder = Responder(db_manager)
+    responder = Responder(db_manager, get_config())
     responder.asleep = False
 
     txs_to_rebroadcast = []

test/pisa/unit/test_watcher.py

@@ -13,6 +13,7 @@ from test.pisa.unit.conftest import (
     generate_dummy_appointment,
     get_random_value_hex,
     generate_keypair,
+    get_config,
 )
 from pisa.conf import EXPIRY_DELTA, MAX_APPOINTMENTS
 
@@ -36,7 +37,7 @@ sk_der = signing_key.private_bytes(
 
 @pytest.fixture(scope="module")
 def watcher(db_manager):
-    return Watcher(db_manager, sk_der)
+    return Watcher(db_manager, sk_der, get_config())
 
 
 @pytest.fixture(scope="module")
@@ -72,7 +73,7 @@ def test_init(watcher):
     assert type(watcher.locator_uuid_map) is dict and len(watcher.locator_uuid_map) == 0
     assert watcher.block_queue.empty()
     assert watcher.asleep is True
-    assert watcher.max_appointments == MAX_APPOINTMENTS
+    assert type(watcher.config) is dict
     assert watcher.zmq_subscriber is None
     assert type(watcher.responder) is Responder