diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
| commit | 2af40cfa14ba579c156349ae3457a55bc93f8548 (patch) | |
| tree | 2b94b53c72d51fc170549213ed8cb88556c2b501 /synapse/storage/event_federation.py | |
| parent | Add a script for talking matrix federation adding X-Matrix Authorization (diff) | |
| parent | Fix pyflakes (diff) | |
| download | synapse-2af40cfa14ba579c156349ae3457a55bc93f8548.tar.xz | |
Merge pull request #25 from matrix-org/events_refactor
Event refactor
Diffstat (limited to 'synapse/storage/event_federation.py')
| -rw-r--r-- | synapse/storage/event_federation.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 6c559f8f63..ced066f407 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -177,14 +177,15 @@ class EventFederationStore(SQLBaseStore): retcols=["prev_event_id", "is_state"], ) + hashes = self._get_prev_event_hashes_txn(txn, event_id) + results = [] for d in res: - hashes = self._get_event_reference_hashes_txn( - txn, - d["prev_event_id"] - ) + edge_hash = self._get_event_reference_hashes_txn(txn, d["prev_event_id"]) + edge_hash.update(hashes.get(d["prev_event_id"], {})) prev_hashes = { - k: encode_base64(v) for k, v in hashes.items() + k: encode_base64(v) + for k, v in edge_hash.items() if k == "sha256" } results.append((d["prev_event_id"], prev_hashes, d["is_state"])) |