aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 22:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates tests to use ChainMonitor as global fixture

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-01-07 16:08:10 +01:00
parent 9bb69d1f5a
commit f10c3c46eb
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/pisa/unit/conftest.py
View File

@@ -15,6 +15,7 @@ from pisa.responder import TransactionTracker
from pisa.watcher import Watcher from pisa.watcher import Watcher
from pisa.tools import bitcoin_cli from pisa.tools import bitcoin_cli
from pisa.db_manager import DBManager from pisa.db_manager import DBManager
from pisa.chain_monitor import ChainMonitor
from common.appointment import Appointment from common.appointment import Appointment
from bitcoind_mock.utils import sha256d from bitcoind_mock.utils import sha256d
@@ -50,6 +51,17 @@ def db_manager():
rmtree("test_db") rmtree("test_db")
@pytest.fixture(scope="module")
def chain_monitor():
chain_monitor = ChainMonitor()
chain_monitor.monitor_chain()
yield chain_monitor
chain_monitor.terminate = True
generate_block()
def generate_keypair(): def generate_keypair():
client_sk = ec.generate_private_key(ec.SECP256K1, default_backend()) client_sk = ec.generate_private_key(ec.SECP256K1, default_backend())
client_pk = client_sk.public_key() client_pk = client_sk.public_key()

5
test/pisa/unit/test_api.py
View File

@@ -31,7 +31,7 @@ locator_dispute_tx_map = {}
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def run_api(db_manager): def run_api(db_manager, chain_monitor):
sk, pk = generate_keypair() sk, pk = generate_keypair()
sk_der = sk.private_bytes( sk_der = sk.private_bytes(
encoding=serialization.Encoding.DER, encoding=serialization.Encoding.DER,
@@ -39,9 +39,6 @@ def run_api(db_manager):
encryption_algorithm=serialization.NoEncryption(), encryption_algorithm=serialization.NoEncryption(),
) )
chain_monitor = ChainMonitor()
chain_monitor.monitor_chain()
watcher = Watcher(db_manager, chain_monitor, sk_der) watcher = Watcher(db_manager, chain_monitor, sk_der)
chain_monitor.attach_watcher(watcher.block_queue, watcher.asleep) chain_monitor.attach_watcher(watcher.block_queue, watcher.asleep)
chain_monitor.attach_responder(watcher.responder.block_queue, watcher.responder.asleep) chain_monitor.attach_responder(watcher.responder.block_queue, watcher.responder.asleep)

8
test/pisa/unit/test_responder.py
View File

@@ -19,14 +19,6 @@ 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
@pytest.fixture(scope="module")
def chain_monitor():
chain_monitor = ChainMonitor()
chain_monitor.monitor_chain()
return chain_monitor
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def responder(db_manager, chain_monitor): def responder(db_manager, chain_monitor):
responder = Responder(db_manager, chain_monitor) responder = Responder(db_manager, chain_monitor)

8
test/pisa/unit/test_watcher.py
View File

@@ -27,14 +27,6 @@ sk_der = signing_key.private_bytes(
) )
@pytest.fixture(scope="module")
def chain_monitor():
chain_monitor = ChainMonitor()
chain_monitor.monitor_chain()
return chain_monitor
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def watcher(db_manager, chain_monitor): def watcher(db_manager, chain_monitor):
watcher = Watcher(db_manager, chain_monitor, sk_der) watcher = Watcher(db_manager, chain_monitor, sk_der)