SYN-103: Remove "origin" and "destination" keys from edus

synapse/federation/units.py

@@ -122,11 +122,10 @@ class Edu(JsonEncodedObject):
         "edu_type",
     ]
 
-#    TODO: SYN-103: Remove "origin" and "destination" keys.
+    internal_keys = [
-#    internal_keys = [
+        "origin",
-#        "origin",
+        "destination",
-#        "destination",
+    ]
-#    ]
 
 
 class Transaction(JsonEncodedObject):

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"},
                     }

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,
             }

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,
             }