Skip to content

feat(reliable-integration): emit VERTEX_METADATA_CHANGED events in reverse topological order #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jansegre merged 1 commit into from
Sep 27, 2023
Merged

feat(reliable-integration): emit VERTEX_METADATA_CHANGED events in reverse topological order #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hathor/consensus/consensus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def _unsafe_update(self, base: BaseTransaction) -> None:
reorg_size=reorg_size)

# finally signal an index update for all affected transactions
sorted_txs_affected = sorted(context.txs_affected, key=lambda tx: not_none(tx.hash))
sorted_txs_affected = sorted(context.txs_affected, key=lambda tx: not_none(tx.timestamp), reverse=True)
for tx_affected in sorted_txs_affected:
assert tx_affected.storage is not None
assert tx_affected.storage.indexes is not None
Expand Down
22 changes: 6 additions & 16 deletions tests/event/test_event_reorg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from typing import Any

from hathor.conf import HathorSettings
from hathor.event.model.event_type import EventType
from hathor.event.storage import EventMemoryStorage
Expand Down Expand Up @@ -54,11 +52,9 @@ def test_reorg_events(self):
(EventType.NEW_VERTEX_ACCEPTED, {'hash': settings.GENESIS_TX1_HASH.hex()}),
(EventType.NEW_VERTEX_ACCEPTED, {'hash': settings.GENESIS_TX2_HASH.hex()}),
(EventType.LOAD_FINISHED, {}),
*sorted_by_hash(
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[0].hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': settings.GENESIS_TX1_HASH.hex()}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': settings.GENESIS_TX2_HASH.hex()}),
),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[0].hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': settings.GENESIS_TX2_HASH.hex()}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': settings.GENESIS_TX1_HASH.hex()}),
(EventType.NEW_VERTEX_ACCEPTED, {'hash': blocks[0].hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[1].hash_hex}),
(EventType.NEW_VERTEX_ACCEPTED, {'hash': blocks[1].hash_hex}),
Expand All @@ -80,11 +76,9 @@ def test_reorg_events(self):
(EventType.NEW_VERTEX_ACCEPTED, {'hash': blocks[9].hash_hex}),
(EventType.REORG_STARTED, {'reorg_size': 2, 'previous_best_block': blocks[9].hash_hex,
'new_best_block': b0.hash_hex}),
*sorted_by_hash(
(EventType.VERTEX_METADATA_CHANGED, {'hash': b0.hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[9].hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[8].hash_hex}),
),
(EventType.VERTEX_METADATA_CHANGED, {'hash': b0.hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[9].hash_hex}),
(EventType.VERTEX_METADATA_CHANGED, {'hash': blocks[8].hash_hex}),
(EventType.REORG_FINISHED, {}),
(EventType.NEW_VERTEX_ACCEPTED, {'hash': b0.hash_hex}),
]
Expand All @@ -98,10 +92,6 @@ def test_reorg_events(self):
self.assertEqual(actual_event.data.dict()[expected_data_key], expected_data_value)


def sorted_by_hash(*events: tuple[EventType, dict[str, Any]]) -> list[tuple[EventType, dict[str, Any]]]:
return sorted(events, key=lambda event: event[1]['hash'])


class SyncV1EventReorgTest(unittest.SyncV1Params, BaseEventReorgTest):
__test__ = True

Expand Down
Loading