Merge branch 'develop' into event_signing

This commit is contained in:
Mark Haines 2014-10-15 13:57:12 +01:00
commit 27d0c1ecc2
5 changed files with 10 additions and 3 deletions

View File

@ -319,7 +319,7 @@ class ReplicationLayer(object):
if hasattr(transaction, "edus"): if hasattr(transaction, "edus"):
for edu in [Edu(**x) for x in 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) results = yield defer.DeferredList(dl)

View File

@ -156,11 +156,15 @@ class Edu(JsonEncodedObject):
] ]
required_keys = [ required_keys = [
"origin",
"destination",
"edu_type", "edu_type",
] ]
# TODO: SYN-103: Remove "origin" and "destination" keys.
# internal_keys = [
# "origin",
# "destination",
# ]
class Transaction(JsonEncodedObject): class Transaction(JsonEncodedObject):
""" A transaction is a list of Pdus and Edus to be sent to a remote home """ A transaction is a list of Pdus and Edus to be sent to a remote home

View File

@ -211,6 +211,7 @@ class FederationTestCase(unittest.TestCase):
"pdus": [], "pdus": [],
"edus": [ "edus": [
{ {
# TODO: SYN-103: Remove "origin" and "destination"
"origin": "test", "origin": "test",
"destination": "remote", "destination": "remote",
"edu_type": "m.test", "edu_type": "m.test",

View File

@ -43,6 +43,7 @@ def _expect_edu(destination, edu_type, content, origin="test"):
"pdus": [], "pdus": [],
"edus": [ "edus": [
{ {
# TODO: SYN-103: Remove "origin" and "destination" keys.
"origin": origin, "origin": origin,
"destination": destination, "destination": destination,
"edu_type": edu_type, "edu_type": edu_type,

View File

@ -33,6 +33,7 @@ def _expect_edu(destination, edu_type, content, origin="test"):
"pdus": [], "pdus": [],
"edus": [ "edus": [
{ {
# TODO: SYN-103: Remove "origin" and "destination" keys.
"origin": origin, "origin": origin,
"destination": destination, "destination": destination,
"edu_type": edu_type, "edu_type": edu_type,