From 063e1b22e62915ec77bfd3cb9477c29600acb568 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 21 Aug 2014 15:06:00 +0100
Subject: [PATCH] Stop internal keys from getting into SynapseEvents

---
 synapse/api/events/__init__.py | 1 +
 synapse/storage/_base.py       | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py
index 921fd0883..aa04dbece 100644
--- a/synapse/api/events/__init__.py
+++ b/synapse/api/events/__init__.py
@@ -51,6 +51,7 @@ class SynapseEvent(JsonEncodedObject):
         "depth",
         "destinations",
         "origin",
+        "outlier",
     ]
 
     required_keys = [
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 36cc57c1b..75aab2d3b 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -294,6 +294,11 @@ class SQLBaseStore(object):
 
     def _parse_event_from_row(self, row_dict):
         d = copy.deepcopy({k: v for k, v in row_dict.items() if v})
+
+        d.pop("stream_ordering", None)
+        d.pop("topological_ordering", None)
+        d.pop("processed", None)
+
         d.update(json.loads(row_dict["unrecognized_keys"]))
         d["content"] = json.loads(d["content"])
         del d["unrecognized_keys"]