From 9aed791fc38790eae6c24e154e7f82ac8509295d Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 14 Oct 2014 16:44:27 +0100
Subject: SYN-103: Ignore the 'origin' key in received EDUs. Instead take the
 origin from the transaction itself

---
 synapse/federation/units.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'synapse/federation/units.py')

diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index ecca35ac43..d97aeb698e 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -156,11 +156,15 @@ class Edu(JsonEncodedObject):
     ]
 
     required_keys = [
-        "origin",
-        "destination",
         "edu_type",
     ]
 
+#    TODO: SYN-103: Remove "origin" and "destination" keys.
+#    internal_keys = [
+#        "origin",
+#        "destination",
+#    ]
+
 
 class Transaction(JsonEncodedObject):
     """ A transaction is a list of Pdus and Edus to be sent to a remote home
-- 
cgit 1.4.1