forked from MirrorHub/synapse
Merge branch 'develop' into event_signing
This commit is contained in:
commit
27d0c1ecc2
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -211,6 +211,7 @@ class FederationTestCase(unittest.TestCase):
|
|||
"pdus": [],
|
||||
"edus": [
|
||||
{
|
||||
# TODO: SYN-103: Remove "origin" and "destination"
|
||||
"origin": "test",
|
||||
"destination": "remote",
|
||||
"edu_type": "m.test",
|
||||
|
|
|
@ -43,6 +43,7 @@ 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,
|
||||
|
|
|
@ -33,6 +33,7 @@ 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,
|
||||
|
|
Loading…
Reference in a new issue