summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-06 18:42:18 +0000
committerErik Johnston <erik@matrix.org>2014-11-07 10:53:38 +0000
commitbf6b72eb558cca94e209a541188079750bfefea0 (patch)
treea464449f4859cf0dabe262a97e12ff126ab6f703 /synapse/api
parentNeaten things up a bit (diff)
downloadsynapse-bf6b72eb558cca94e209a541188079750bfefea0.tar.xz
Start implementing auth chains
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py3
-rw-r--r--synapse/api/events/__init__.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index bb25c4ec55..e1302553d7 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -21,8 +21,7 @@ from synapse.api.constants import Membership, JoinRules
 from synapse.api.errors import AuthError, StoreError, Codes, SynapseError
 from synapse.api.events.room import (
     RoomMemberEvent, RoomPowerLevelsEvent, RoomRedactionEvent,
-    RoomJoinRulesEvent, InviteJoinEvent,
-    RoomCreateEvent,
+    RoomJoinRulesEvent, RoomCreateEvent,
 )
 from synapse.util.logutils import log_function
 
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py
index 84d3a98365..513a48f568 100644
--- a/synapse/api/events/__init__.py
+++ b/synapse/api/events/__init__.py
@@ -61,7 +61,7 @@ class SynapseEvent(JsonEncodedObject):
         "replaces_state",
         "redacted_because",
         "origin_server_ts",
-        "auth_chains",
+        "auth_events",
     ]
 
     internal_keys = [