Update tests to remove the asleep flags

test/pisa/unit/test_watcher.py

@@ -1,5 +1,6 @@
 import pytest
 from uuid import uuid4
+from shutil import rmtree
 from threading import Thread
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization
@@ -8,6 +9,7 @@ from pisa.watcher import Watcher
 from pisa.responder import Responder
 from pisa.tools import bitcoin_cli
 from pisa.chain_monitor import ChainMonitor
+from pisa.db_manager import DBManager
 
 from test.pisa.unit.conftest import (
     generate_blocks,
@@ -36,11 +38,22 @@ sk_der = signing_key.private_bytes(
 )
 
 
+@pytest.fixture(scope="session")
+def temp_db_manager():
+    db_name = get_random_value_hex(8)
+    db_manager = DBManager(db_name)
+
+    yield db_manager
+
+    db_manager.db.close()
+    rmtree(db_name)
+
+
 @pytest.fixture(scope="module")
-def watcher(db_manager, chain_monitor):
-    watcher = Watcher(db_manager, chain_monitor, sk_der, get_config())
-    chain_monitor.attach_watcher(watcher.block_queue, watcher.asleep)
-    chain_monitor.attach_responder(watcher.responder.block_queue, watcher.responder.asleep)
+def watcher(db_manager):
+    watcher = Watcher(db_manager, Responder(db_manager), sk_der, get_config())
+    chain_monitor = ChainMonitor(watcher.block_queue, watcher.responder.block_queue)
+    chain_monitor.monitor_chain()
 
     return watcher
 
@@ -76,19 +89,13 @@ def create_appointments(n):
 def test_init(run_bitcoind, watcher):
     assert isinstance(watcher.appointments, dict) and len(watcher.appointments) == 0
     assert isinstance(watcher.locator_uuid_map, dict) and len(watcher.locator_uuid_map) == 0
-    assert watcher.asleep is True
     assert watcher.block_queue.empty()
-    assert isinstance(watcher.chain_monitor, ChainMonitor)
     assert isinstance(watcher.config, dict)
     assert isinstance(watcher.signing_key, ec.EllipticCurvePrivateKey)
     assert isinstance(watcher.responder, Responder)
 
 
 def test_add_appointment(watcher):
-    # The watcher automatically fires do_watch and do_subscribe on adding an appointment if it is asleep (initial state)
-    # Avoid this by setting the state to awake.
-    watcher.asleep = False
-
     # We should be able to add appointments up to the limit
     for _ in range(10):
         appointment, dispute_tx = generate_dummy_appointment(
@@ -128,10 +135,11 @@ def test_add_too_many_appointments(watcher):
     assert sig is None
 
 
-def test_do_watch(watcher):
+def test_do_watch(watcher, temp_db_manager):
+    watcher.db_manager = temp_db_manager
+
     # We will wipe all the previous data and add 5 appointments
     appointments, locator_uuid_map, dispute_txs = create_appointments(APPOINTMENTS)
-    watcher.chain_monitor.watcher_asleep = False
 
     # Set the data into the Watcher and in the db
     watcher.locator_uuid_map = locator_uuid_map
@@ -142,7 +150,8 @@ def test_do_watch(watcher):
         watcher.db_manager.store_watcher_appointment(uuid, appointment.to_json())
         watcher.db_manager.create_append_locator_map(appointment.locator, uuid)
 
-    Thread(target=watcher.do_watch, daemon=True).start()
+    do_watch_thread = Thread(target=watcher.do_watch, daemon=True)
+    do_watch_thread.start()
 
     # Broadcast the first two
     for dispute_tx in dispute_txs[:2]:
@@ -158,7 +167,6 @@ def test_do_watch(watcher):
     generate_blocks(EXPIRY_DELTA + START_TIME_OFFSET + END_TIME_OFFSET)
 
     assert len(watcher.appointments) == 0
-    assert watcher.asleep is True
 
 
 def test_get_breaches(watcher, txids, locator_uuid_map):