From 8d8a133c89925086452bdec9739db589f0715363 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 13 Nov 2014 15:48:51 +0000
Subject: [PATCH] SYN-103: Remove "origin" and "destination" keys from edus

---
 synapse/federation/units.py         | 9 ++++-----
 tests/federation/test_federation.py | 3 ---
 tests/handlers/test_presence.py     | 3 ---
 tests/handlers/test_typing.py       | 3 ---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index f4e7b62bd9..70412439cd 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -122,11 +122,10 @@ class Edu(JsonEncodedObject):
         "edu_type",
     ]
 
-#    TODO: SYN-103: Remove "origin" and "destination" keys.
-#    internal_keys = [
-#        "origin",
-#        "destination",
-#    ]
+    internal_keys = [
+        "origin",
+        "destination",
+    ]
 
 
 class Transaction(JsonEncodedObject):
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index eb329eec50..ad09fab392 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -218,9 +218,6 @@ class FederationTestCase(unittest.TestCase):
                 "pdus": [],
                 "edus": [
                     {
-                        # TODO: SYN-103: Remove "origin" and "destination"
-                        "origin": "test",
-                        "destination": "remote",
                         "edu_type": "m.test",
                         "content": {"testing": "content here"},
                     }
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index a6af648def..cdaf93429b 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -44,9 +44,6 @@ def _expect_edu(destination, edu_type, content, origin="test"):
         "pdus": [],
         "edus": [
             {
-                # TODO: SYN-103: Remove "origin" and "destination" keys.
-                "origin": origin,
-                "destination": destination,
                 "edu_type": edu_type,
                 "content": content,
             }
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 07acda5eee..adb5148351 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -33,9 +33,6 @@ def _expect_edu(destination, edu_type, content, origin="test"):
         "pdus": [],
         "edus": [
             {
-                # TODO: SYN-103: Remove "origin" and "destination" keys.
-                "origin": origin,
-                "destination": destination,
                 "edu_type": edu_type,
                 "content": content,
             }