summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-23 10:27:06 +0000
committerErik Johnston <erik@matrix.org>2018-02-23 10:27:06 +0000
commit185740f887a2e1ea2ffe468dfa42d3e08a61c5a8 (patch)
treecd6f24b07498ee3b41c5e55ad5032012dad2809e /synapse/federation
parentMerge pull request #2893 from matrix-org/erikj/delete_from_staging_fed (diff)
downloadsynapse-github/erikj/compact_event.tar.xz
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/units.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py

index 3f645acc43..d0ddb12e15 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py
@@ -121,9 +121,12 @@ class Transaction(JsonEncodedObject): "Require 'transaction_id' to construct a Transaction" ) + pdu_dicts = [] for p in pdus: - p.transaction_id = kwargs["transaction_id"] + d = p.get_pdu_json() + # d["transaction_id"] = kwargs["transaction_id"] + pdu_dicts.append(d) - kwargs["pdus"] = [p.get_pdu_json() for p in pdus] + kwargs["pdus"] = pdu_dicts return Transaction(**kwargs)