From cb4b6c844a0c9e2d4a96165958ff5680ed82e160 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 14 Nov 2014 21:25:02 +0000
Subject: Merge PDUs and Events into one object

---
 synapse/storage/_base.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'synapse/storage/_base.py')

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 30e6eac8db..5d4be09a82 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -492,6 +492,14 @@ class SQLBaseStore(object):
                 for n, s in signatures.items()
             }
 
+            hashes = self._get_event_content_hashes_txn(
+                txn, ev.event_id,
+            )
+
+            ev.hashes = {
+                k: encode_base64(v) for k, v in hashes.items()
+            }
+
             prevs = self._get_prev_events_and_state(txn, ev.event_id)
 
             ev.prev_events = [
-- 
cgit 1.4.1