summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-03 11:35:19 +0000
committerErik Johnston <erik@matrix.org>2014-11-03 11:35:19 +0000
commitd59aa6af25472a15e6258f2fd9cbd1ac4c05702d (patch)
treec2b3b16e6de62e75b1ddfb50acfbbf5be4a43882
parentFormatting (diff)
downloadsynapse-d59aa6af25472a15e6258f2fd9cbd1ac4c05702d.tar.xz
For now, don't store txn -> pdu mappings.
Diffstat (limited to '')
-rw-r--r--synapse/federation/persistence.py1
-rw-r--r--synapse/storage/transactions.py7
2 files changed, 3 insertions, 5 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index a565375e68..b04fbb4177 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -88,7 +88,6 @@ class TransactionActions(object):
             transaction.transaction_id,
             transaction.destination,
             transaction.origin_server_ts,
-            [(p["pdu_id"], p["origin"]) for p in transaction.pdus]
         )
 
     @log_function
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index ea67900788..00d0f48082 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -89,7 +89,7 @@ class TransactionStore(SQLBaseStore):
         txn.execute(query, (code, response_json, transaction_id, origin))
 
     def prep_send_transaction(self, transaction_id, destination,
-                              origin_server_ts, pdu_list):
+                              origin_server_ts):
         """Persists an outgoing transaction and calculates the values for the
         previous transaction id list.
 
@@ -100,7 +100,6 @@ class TransactionStore(SQLBaseStore):
             transaction_id (str)
             destination (str)
             origin_server_ts (int)
-            pdu_list (list)
 
         Returns:
             list: A list of previous transaction ids.
@@ -109,11 +108,11 @@ class TransactionStore(SQLBaseStore):
         return self.runInteraction(
             "prep_send_transaction",
             self._prep_send_transaction,
-            transaction_id, destination, origin_server_ts, pdu_list
+            transaction_id, destination, origin_server_ts
         )
 
     def _prep_send_transaction(self, txn, transaction_id, destination,
-                               origin_server_ts, pdu_list):
+                               origin_server_ts):
 
         # First we find out what the prev_txs should be.
         # Since we know that we are only sending one transaction at a time,