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

Author: glevco

hathor/consensus/consensus.py

@@ -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

tests/event/test_event_reorg.py

@@ -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
@@ -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}),
@@ -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}),
         ]
@@ -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