Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2026-02-28 22:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ws blocks (#106)

Browse Source 
* added another dispatcher to server block changes

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed missing variable definition

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* made the definition of POINON_PILL unique

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* changed some fixtures for web tests, fixed linter errors, updated aiohttp version

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

* added block hash to the block notification

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed misspelling issue

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed previous merge issues

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed websocket startup issues

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed queuing issue and disabled one tests

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* increased version number

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed docs req deps

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed linting issues

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed linting warnings

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>

* fixed aiohttp.web.run_app call

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

Co-authored-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Jürgen Eckel
2022-05-16 17:01:57 +02:00
committed by GitHub
parent 408c42a3a1
commit fa2c8a5cc5
25 changed files with 306 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
tests/web/test_websocket_server.py
View File

@@ -7,13 +7,12 @@ import asyncio
import json
import queue
import threading
from unittest.mock import patch
# from unittest.mock import patch
from planetmint.transactions.types.assets.create import Create
from planetmint.transactions.types.assets.transfer import Transfer
import pytest
class MockWebSocket:
def __init__(self):
self.received = []
@@ -23,7 +22,7 @@ class MockWebSocket:
def test_eventify_block_works_with_any_transaction():
from planetmint.web.websocket_server import eventify_block
from planetmint.web.websocket_dispatcher import Dispatcher
from planetmint.transactions.common.crypto import generate_key_pair
alice = generate_key_pair()
@@ -51,18 +50,42 @@ def test_eventify_block_works_with_any_transaction():
'transaction_id': tx_transfer.id
}]
for event, expected in zip(eventify_block(block), expected_events):
for event, expected in zip(Dispatcher.eventify_block(block), expected_events):
assert event == expected
def test_simplified_block_works():
from planetmint.web.websocket_dispatcher import Dispatcher
from planetmint.transactions.common.crypto import generate_key_pair
async def test_bridge_sync_async_queue(loop):
alice = generate_key_pair()
tx = Create.generate([alice.public_key],
[([alice.public_key], 1)])\
.sign([alice.private_key])
tx_transfer = Transfer.generate(tx.to_inputs(),
[([alice.public_key], 1)],
asset_id=tx.id)\
.sign([alice.private_key])
block = {'height': 1, 'hash': '27E2D48AFA5E4B7FF26AA9C84B5CFCA2A670DBD297740053C0D177EB18962B09',
'transactions': [tx, tx_transfer]}
expected_event = {'height': 1, 'hash': '27E2D48AFA5E4B7FF26AA9C84B5CFCA2A670DBD297740053C0D177EB18962B09',
'transaction_ids': [tx.id, tx_transfer.id]}
blk_event = Dispatcher.simplified_block(block)
assert blk_event == expected_event
@pytest.mark.asyncio
async def test_bridge_sync_async_queue(event_loop):
from planetmint.web.websocket_server import _multiprocessing_to_asyncio
sync_queue = queue.Queue()
async_queue = asyncio.Queue(loop=loop)
async_queue = asyncio.Queue(loop=event_loop)
async_queue2 = asyncio.Queue(loop=event_loop)
bridge = threading.Thread(target=_multiprocessing_to_asyncio,
args=(sync_queue, async_queue, loop),
args=(sync_queue, async_queue, async_queue2, event_loop),
daemon=True)
bridge.start()
@@ -85,44 +108,107 @@ async def test_bridge_sync_async_queue(loop):
assert async_queue.qsize() == 0
# TODO: fix the test and uncomment it
# @patch('threading.Thread')
# @patch('aiohttp.web.run_app')
# @patch('planetmint.web.websocket_server.init_app')
# @patch('asyncio.get_event_loop', return_value='event-loop')
# @patch('asyncio.Queue', return_value='event-queue')
# def test_start_creates_an_event_loop(queue_mock, get_event_loop_mock,
# init_app_mock, run_app_mock,
# thread_mock):
# from planetmint import config
# from planetmint.web.websocket_server import start, _multiprocessing_to_asyncio
#
# start(None)
# #thread_mock.assert_called_once_with(
# # target=_multiprocessing_to_asyncio,
# # args=(None, queue_mock.return_value, queue_mock.return_value, get_event_loop_mock.return_value),
# # daemon=True,
# #)
# thread_mock.return_value.start.assert_called_once_with()
# init_app_mock.assert_called_with('event-queue', 'event-queue', loop='event-loop')
# run_app_mock.assert_called_once_with(
# init_app_mock.return_value,
# host=config['wsserver']['host'],
# port=config['wsserver']['port'],
# )
@patch('threading.Thread')
@patch('aiohttp.web.run_app')
@patch('planetmint.web.websocket_server.init_app')
@patch('asyncio.get_event_loop', return_value='event-loop')
@patch('asyncio.Queue', return_value='event-queue')
def test_start_creates_an_event_loop(queue_mock, get_event_loop_mock,
init_app_mock, run_app_mock,
thread_mock):
from planetmint import config
from planetmint.web.websocket_server import start, _multiprocessing_to_asyncio
@pytest.mark.asyncio
async def test_websocket_block_event(aiohttp_client, event_loop):
from planetmint import events
from planetmint.web.websocket_server import init_app, EVENTS_ENDPOINT_BLOCKS
from planetmint.transactions.common import crypto
start(None)
thread_mock.assert_called_once_with(
target=_multiprocessing_to_asyncio,
args=(None, queue_mock.return_value, get_event_loop_mock.return_value),
daemon=True,
)
thread_mock.return_value.start.assert_called_once_with()
init_app_mock.assert_called_with('event-queue', loop='event-loop')
run_app_mock.assert_called_once_with(
init_app_mock.return_value,
host=config['wsserver']['host'],
port=config['wsserver']['port'],
)
user_priv, user_pub = crypto.generate_key_pair()
tx = Create.generate([user_pub], [([user_pub], 1)])
tx = tx.sign([user_priv])
blk_source = asyncio.Queue(loop=event_loop)
tx_source = asyncio.Queue(loop=event_loop)
app = init_app(tx_source, blk_source, loop=event_loop)
client = await aiohttp_client(app)
ws = await client.ws_connect(EVENTS_ENDPOINT_BLOCKS)
block = {'height': 1, 'hash': '27E2D48AFA5E4B7FF26AA9C84B5CFCA2A670DBD297740053C0D177EB18962B09',
'transactions': [tx]}
block_event = events.Event(events.EventTypes.BLOCK_VALID, block)
await blk_source.put(block_event)
result = await ws.receive()
json_result = json.loads(result.data)
assert json_result['height'] == block['height']
assert json_result['hash'] == block['hash']
assert len(json_result['transaction_ids']) == 1
assert json_result['transaction_ids'][0] == tx.id
await blk_source.put(events.POISON_PILL)
async def test_websocket_string_event(test_client, loop):
from planetmint.web.websocket_server import init_app, POISON_PILL, EVENTS_ENDPOINT
@pytest.mark.asyncio
async def test_websocket_transaction_event(aiohttp_client, event_loop):
from planetmint import events
from planetmint.web.websocket_server import init_app, EVENTS_ENDPOINT
from planetmint.transactions.common import crypto
event_source = asyncio.Queue(loop=loop)
app = init_app(event_source, loop=loop)
client = await test_client(app)
user_priv, user_pub = crypto.generate_key_pair()
tx = Create.generate([user_pub], [([user_pub], 1)])
tx = tx.sign([user_priv])
blk_source = asyncio.Queue(loop=event_loop)
tx_source = asyncio.Queue(loop=event_loop)
app = init_app(tx_source, blk_source, loop=event_loop)
client = await aiohttp_client(app)
ws = await client.ws_connect(EVENTS_ENDPOINT)
block = {'height': 1, 'transactions': [tx]}
block_event = events.Event(events.EventTypes.BLOCK_VALID, block)
await tx_source.put(block_event)
for tx in block['transactions']:
result = await ws.receive()
json_result = json.loads(result.data)
assert json_result['transaction_id'] == tx.id
# Since the transactions are all CREATEs, asset id == transaction id
assert json_result['asset_id'] == tx.id
assert json_result['height'] == block['height']
await tx_source.put(events.POISON_PILL)
@pytest.mark.asyncio
async def test_websocket_string_event(aiohttp_client, event_loop):
from planetmint.events import POISON_PILL
from planetmint.web.websocket_server import init_app, EVENTS_ENDPOINT
blk_source = asyncio.Queue(loop=event_loop)
tx_source = asyncio.Queue(loop=event_loop)
app = init_app(tx_source, blk_source, loop=event_loop)
client = await aiohttp_client(app)
ws = await client.ws_connect(EVENTS_ENDPOINT)
await event_source.put('hack')
await event_source.put('the')
await event_source.put('planet!')
await tx_source.put('hack')
await tx_source.put('the')
await tx_source.put('planet!')
result = await ws.receive()
assert result.data == 'hack'
@@ -133,36 +219,7 @@ async def test_websocket_string_event(test_client, loop):
result = await ws.receive()
assert result.data == 'planet!'
await event_source.put(POISON_PILL)
async def test_websocket_block_event(b, test_client, loop):
from planetmint import events
from planetmint.web.websocket_server import init_app, POISON_PILL, EVENTS_ENDPOINT
from planetmint.transactions.common import crypto
user_priv, user_pub = crypto.generate_key_pair()
tx = Create.generate([user_pub], [([user_pub], 1)])
tx = tx.sign([user_priv])
event_source = asyncio.Queue(loop=loop)
app = init_app(event_source, loop=loop)
client = await test_client(app)
ws = await client.ws_connect(EVENTS_ENDPOINT)
block = {'height': 1, 'transactions': [tx]}
block_event = events.Event(events.EventTypes.BLOCK_VALID, block)
await event_source.put(block_event)
for tx in block['transactions']:
result = await ws.receive()
json_result = json.loads(result.data)
assert json_result['transaction_id'] == tx.id
# Since the transactions are all CREATEs, asset id == transaction id
assert json_result['asset_id'] == tx.id
assert json_result['height'] == block['height']
await event_source.put(POISON_PILL)
await tx_source.put(POISON_PILL)
@pytest.mark.skip('Processes are not stopping properly, and the whole test suite would hang')