summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-15 13:57:12 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-15 13:57:12 +0100
commit27d0c1ecc21026e9fb231746114b53b83ed0b594 (patch)
treee32b0781ff4ff7d46b3cf25f2f2715aa9248cc16 /synapse/federation
parentStorage for pdu signatures (diff)
parentSYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr... (diff)
downloadsynapse-27d0c1ecc21026e9fb231746114b53b83ed0b594.tar.xz
Merge branch 'develop' into event_signing
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/replication.py2
-rw-r--r--synapse/federation/units.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 2346d55045..9363ac7300 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -319,7 +319,7 @@ class ReplicationLayer(object):
 
         if hasattr(transaction, "edus"):
             for edu in [Edu(**x) for x in transaction.edus]:
-                self.received_edu(edu.origin, edu.edu_type, edu.content)
+                self.received_edu(transaction.origin, edu.edu_type, edu.content)
 
         results = yield defer.DeferredList(dl)
 
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